net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java - Issue 2812963002: [Cronet] Move initialization to a new thread rather than the UI thread.

Unified Diff: net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

Issue 2812963002: [Cronet] Move initialization to a new thread rather than the UI thread. (Closed)

Patch Set: update tests to account for mRegistered change Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

index e1da29a3e4bd92b10d7961087935ecc9840afe0f..b5e21816fe82603057f43f9fa760e3896fd5bd0d 100644

--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

@@ -26,12 +26,14 @@ import android.net.NetworkRequest;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.os.Build;

+import android.os.Handler;

+import android.os.Looper;

import android.telephony.TelephonyManager;

import org.chromium.base.ApplicationState;

import org.chromium.base.ApplicationStatus;

+import org.chromium.base.BuildConfig;

import org.chromium.base.ContextUtils;

-import org.chromium.base.ThreadUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.base.metrics.RecordHistogram;

@@ -365,7 +367,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

}

String getWifiSsid() {

- // Synchronized because this method can be called on multiple threads (e.g. UI thread

+ // Synchronized because this method can be called on multiple threads (e.g. mLooper

// from a private caller, and another thread calling a public API like

// getCurrentNetworkState) and is otherwise racy.

synchronized (mLock) {

@@ -407,7 +409,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

// This class gets called back by ConnectivityManager whenever networks come

// and go. It gets called back on a special handler thread

// ConnectivityManager creates for making the callbacks. The callbacks in

- // turn post to the UI thread where mObserver lives.

+ // turn post to mLooper where mObserver lives.

@TargetApi(Build.VERSION_CODES.LOLLIPOP)

private class MyNetworkCallback extends NetworkCallback {

// If non-null, this indicates a VPN is in place for the current user, and no other

@@ -482,7 +484,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

final long netId = networkToNetId(network);

@ConnectionType

final int connectionType = mConnectivityManagerDelegate.getConnectionType(network);

- ThreadUtils.postOnUiThread(new Runnable() {

+ runOnThread(new Runnable() {

@Override

public void run() {

mObserver.onNetworkConnect(netId, connectionType);

@@ -506,7 +508,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

// so forward the new ConnectionType along to observer.

final long netId = networkToNetId(network);

final int connectionType = mConnectivityManagerDelegate.getConnectionType(network);

- ThreadUtils.postOnUiThread(new Runnable() {

+ runOnThread(new Runnable() {

@Override

public void run() {

mObserver.onNetworkConnect(netId, connectionType);

@@ -520,7 +522,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

return;

}

final long netId = networkToNetId(network);

- ThreadUtils.postOnUiThread(new Runnable() {

+ runOnThread(new Runnable() {

@Override

public void run() {

mObserver.onNetworkSoonToDisconnect(netId);

@@ -533,7 +535,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

if (ignoreNetworkDueToVpn(network)) {

return;

}

- ThreadUtils.postOnUiThread(new Runnable() {

+ runOnThread(new Runnable() {

@Override

public void run() {

mObserver.onNetworkDisconnect(networkToNetId(network));

@@ -551,7 +553,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

}

@ConnectionType

final int newConnectionType = convertToConnectionType(getCurrentNetworkState());

- ThreadUtils.postOnUiThread(new Runnable() {

+ runOnThread(new Runnable() {

@Override

public void run() {

mObserver.onConnectionTypeChanged(newConnectionType);

@@ -595,10 +597,16 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

protected abstract void destroy();

}

- private static final String TAG = "NetworkChangeNotifierAutoDetect";

+ private static final String TAG = NetworkChangeNotifierAutoDetect.class.getSimpleName();

private static final int UNKNOWN_LINK_SPEED = -1;

+ // {@link Looper} for the thread this object lives on.

+ private final Looper mLooper;

+ // Used to post to the thread this object lives on.

+ private final Handler mHandler;

+ // {@link IntentFilter} for incoming global broadcast {@link Intent}s this object listens for.

private final NetworkConnectivityIntentFilter mIntentFilter;

+ // Notifications are sent to this {@link Observer}.

private final Observer mObserver;

private final RegistrationPolicy mRegistrationPolicy;

@@ -673,16 +681,17 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

}

/**

- * Constructs a NetworkChangeNotifierAutoDetect. Should only be called on UI thread.

+ * Constructs a NetworkChangeNotifierAutoDetect. Lives on calling thread, receives broadcast

+ * notifications on the UI thread and forwards the notifications to be processed on the calling

+ * thread.

* @param policy The RegistrationPolicy which determines when this class should watch

* for network changes (e.g. see (@link RegistrationPolicyAlwaysRegister} and

* {@link RegistrationPolicyApplicationStatus}).

@TargetApi(Build.VERSION_CODES.LOLLIPOP)

public NetworkChangeNotifierAutoDetect(Observer observer, RegistrationPolicy policy) {

- // Since BroadcastReceiver is always called back on UI thread, ensure

- // running on UI thread so notification logic can be single-threaded.

- ThreadUtils.assertOnUiThread();

+ mLooper = Looper.myLooper();

+ mHandler = new Handler(mLooper);

mObserver = observer;

mConnectivityManagerDelegate =

new ConnectivityManagerDelegate(ContextUtils.getApplicationContext());

@@ -711,6 +720,25 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

mShouldSignalObserver = true;

}

+ private boolean onThread() {

+ return mLooper == Looper.myLooper();

+ }

+ private void assertOnThread() {

+ if (BuildConfig.DCHECK_IS_ON && !onThread()) {

+ throw new IllegalStateException(

+ "Must be called on NetworkChangeNotifierAutoDetect thread.");

+ }

+ private void runOnThread(Runnable r) {

+ if (onThread()) {

+ r.run();

+ } else {

+ mHandler.post(r);

+ }

/**

* Allows overriding the ConnectivityManagerDelegate for tests.

@@ -739,6 +767,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

}

public void destroy() {

+ assertOnThread();

mRegistrationPolicy.destroy();

unregister();

}

@@ -747,7 +776,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

* Registers a BroadcastReceiver in the given context.

public void register() {

- ThreadUtils.assertOnUiThread();

+ assertOnThread();

if (mRegistered) return;

if (mShouldSignalObserver) {

@@ -788,6 +817,7 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

* Unregisters a BroadcastReceiver in the given context.

public void unregister() {

+ assertOnThread();

if (!mRegistered) return;

ContextUtils.getApplicationContext().unregisterReceiver(this);

mRegistered = false;

@@ -995,15 +1025,23 @@ public class NetworkChangeNotifierAutoDetect extends BroadcastReceiver {

// BroadcastReceiver

@Override

public void onReceive(Context context, Intent intent) {

- if (mIgnoreNextBroadcast) {

- mIgnoreNextBroadcast = false;

- return;

- }

- final NetworkState networkState = getCurrentNetworkState();

- if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {

- connectionTypeChanged(networkState);

- maxBandwidthChanged(networkState);

- }

+ runOnThread(new Runnable() {

+ @Override

+ public void run() {

+ // Once execution begins on the correct thread, make sure unregister() hasn't

+ // been called in the mean time. Ignore the broadcast if unregister() was called.

+ if (!mRegistered) {

+ return;

+ }

+ if (mIgnoreNextBroadcast) {

+ mIgnoreNextBroadcast = false;

+ return;

+ }

+ final NetworkState networkState = getCurrentNetworkState();

+ connectionTypeChanged(networkState);

+ maxBandwidthChanged(networkState);

+ }

+ });

}

private void connectionTypeChanged(NetworkState networkState) {

« no previous file with comments | « net/android/BUILD.gn ('k') | net/android/java/src/org/chromium/net/ProxyChangeListener.java » ('j') | no next file with comments »