commit a1770e75d03b8d69c835b457f035e90c2e9996c8
author Evan Birenbaum <birenbaum@google.com> Wed May 25 10:17:44 2016 -0700
committer Evan Birenbaum <birenbaum@google.com> Fri Jun 24 16:08:29 2016 +0000
tree e3318e4aeb076899d99f20298ee03be2ae05b7da
parent 1cf985bff6ead5326a2a5cbc6d29cec0e65036f6

Make the DevTools Connectivity lock non reference counted.

To avoid a race on checking if the lock is held.

Change-Id: Iee836447ab0cf6586fa8ece570cc821cd7c6fcd4

apps/Development/src/com/android/development/Connectivity.java

diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java
index 5650482..0a6a4ca 100644
--- a/apps/Development/src/com/android/development/Connectivity.java
+++ b/apps/Development/src/com/android/development/Connectivity.java
@@ -406,6 +406,7 @@
 
         mWm = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         mWml = mWm.createMulticastLock(TAG);
+        mWml.setReferenceCounted(false);
         mPm = (PowerManager)getSystemService(Context.POWER_SERVICE);
         mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
@@ -486,9 +487,7 @@
         mCm.unregisterNetworkCallback(mCallback);
         mCallback = null;
         unregisterReceiver(mReceiver);
-        if (mWml.isHeld()) {
-            mWml.release();
-        }
+        mWml.release();
     }
 
     @Override