[Cronet] Move initialization to a new thread rather than the UI thread.

net/android/java/src/org/chromium/net/ProxyChangeListener.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Proxy;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.chromium.base.BuildConfig;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeClassQualifiedName;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 /**
  * This class partners with native ProxyConfigServiceAndroid to listen for
  * proxy change notifications from Android.
  */
 @JNINamespace("net")
 public class ProxyChangeListener {
     private static final String TAG = "ProxyChangeListener";
     private static boolean sEnabled = true;
 
+    private final Context mContext;
+    private final Looper mLooper;
+    private final Handler mHandler;
+
     private long mNativePtr;
-    private Context mContext;
     private ProxyReceiver mProxyReceiver;
     private Delegate mDelegate;
 
     private static class ProxyConfig {
         public ProxyConfig(String host, int port, String pacUrl, String[] exclusionList) {
             mHost = host;
             mPort = port;
             mPacUrl = pacUrl;
             mExclusionList = exclusionList;
         }
         public final String mHost;
         public final int mPort;
         public final String mPacUrl;
         public final String[] mExclusionList;
     }
 
     /**
      * The delegate for ProxyChangeListener. Use for testing.
      */
     public interface Delegate {
         public void proxySettingsChanged();
     }
 
     private ProxyChangeListener(Context context) {
         mContext = context;
+        mLooper = Looper.myLooper();
+        mHandler = new Handler(mLooper);
     }
 
     public static void setEnabled(boolean enabled) {
         sEnabled = enabled;
     }
 
     public void setDelegateForTesting(Delegate delegate) {
         mDelegate = delegate;
     }
 
     @CalledByNative
     public static ProxyChangeListener create(Context context) {
         return new ProxyChangeListener(context);
     }
 
     @CalledByNative
     public static String getProperty(String property) {
         return System.getProperty(property);
     }
 
     @CalledByNative
     public void start(long nativePtr) {
+        assertOnThread();
         assert mNativePtr == 0;
         mNativePtr = nativePtr;
         registerReceiver();
     }
 
     @CalledByNative
     public void stop() {
+        assertOnThread();
         mNativePtr = 0;
         unregisterReceiver();
     }
 
     private class ProxyReceiver extends BroadcastReceiver {
         @Override
-        public void onReceive(Context context, Intent intent) {
+        public void onReceive(Context context, final Intent intent) {
             if (intent.getAction().equals(Proxy.PROXY_CHANGE_ACTION)) {
-                proxySettingsChanged(extractNewProxy(intent));
+                runOnThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        proxySettingsChanged(ProxyReceiver.this, extractNewProxy(intent));
+                    }
+                });
             }
         }
 
         // Extract a ProxyConfig object from the supplied Intent's extra data
         // bundle. The android.net.ProxyProperties class is not exported from
         // the Android SDK, so we have to use reflection to get at it and invoke
         // methods on it. If we fail, return an empty proxy config (meaning
         // 'direct').
         // TODO(sgurun): once android.net.ProxyInfo is public, rewrite this.
         private ProxyConfig extractNewProxy(Intent intent) {
@@ skipping 60 matching lines @@
             } catch (InvocationTargetException ex) {
                 Log.e(TAG, "Using no proxy configuration due to exception:" + ex);
                 return null;
             } catch (NullPointerException ex) {
                 Log.e(TAG, "Using no proxy configuration due to exception:" + ex);
                 return null;
             }
         }
     }
 
-    private void proxySettingsChanged(ProxyConfig cfg) {
-        if (!sEnabled) {
+    private void proxySettingsChanged(ProxyReceiver proxyReceiver, ProxyConfig cfg) {
+        if (!sEnabled || proxyReceiver != mProxyReceiver) {

[xunjieli, 2017/04/13 18:44:54]

Same here. Maybe add a comment on we need this extra "proxyReceived !=
mProxyReceiver" check ?

[pauljensen, 2017/05/01 15:35:53]

Done.

             return;
         }
         if (mDelegate != null) {
             mDelegate.proxySettingsChanged();
         }
         if (mNativePtr == 0) {
             return;
         }
         // Note that this code currently runs on a MESSAGE_LOOP_UI thread, but
         // the C++ code must run the callbacks on the network thread.
@@ skipping 16 matching lines @@
     }
 
     private void unregisterReceiver() {
         if (mProxyReceiver == null) {
             return;
         }
         mContext.unregisterReceiver(mProxyReceiver);
         mProxyReceiver = null;
     }
 
+    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.");

[xunjieli, 2017/04/13 18:44:54]

nit: s/NetworkChangeNotifierAutoDetect/ProxyChangeListener

[pauljensen, 2017/05/01 15:35:53]

Done.

+        }
+    }
+
+    private void runOnThread(Runnable r) {
+        if (onThread()) {
+            r.run();
+        } else {
+            mHandler.post(r);
+        }
+    }
+
     /**
      * See net/proxy/proxy_config_service_android.cc
      */
     @NativeClassQualifiedName("ProxyConfigServiceAndroid::JNIDelegate")
     private native void nativeProxySettingsChangedTo(long nativePtr,
                                                      String host,
                                                      int port,
                                                      String pacUrl,
                                                      String[] exclusionList);
     @NativeClassQualifiedName("ProxyConfigServiceAndroid::JNIDelegate")
     private native void nativeProxySettingsChanged(long nativePtr);
 }