Make the DevTools Connectivity lock non reference counted.

am: a1770e75d0 Change-Id: Ia57f9f3529d29c273795546f4e4b23665be80aaa
2016-06-27 17:02:30 +00:00
parent 7bd0dc821e a1770e75d0
commit 0ec12ccca8
1 changed files with 2 additions and 3 deletions
--- a/apps/Development/src/com/android/development/Connectivity.java
+++ b/apps/Development/src/com/android/development/Connectivity.java
@@ -406,6 +406,7 @@ public class Connectivity extends Activity {

        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 @@ public class Connectivity extends Activity {
        mCm.unregisterNetworkCallback(mCallback);
        mCallback = null;
        unregisterReceiver(mReceiver);
-        if (mWml.isHeld()) {
-            mWml.release();
-        }
+        mWml.release();
    }

    @Override