diff options
| author | Evan Birenbaum <birenbaum@google.com> | 2016-05-25 10:17:44 -0700 |
|---|---|---|
| committer | Evan Birenbaum <birenbaum@google.com> | 2016-06-24 16:08:29 +0000 |
| commit | a1770e75d03b8d69c835b457f035e90c2e9996c8 (patch) | |
| tree | e3318e4aeb076899d99f20298ee03be2ae05b7da /apps/Development | |
| parent | 1cf985bff6ead5326a2a5cbc6d29cec0e65036f6 (diff) | |
| download | android_development-a1770e75d03b8d69c835b457f035e90c2e9996c8.tar.gz android_development-a1770e75d03b8d69c835b457f035e90c2e9996c8.tar.bz2 android_development-a1770e75d03b8d69c835b457f035e90c2e9996c8.zip | |
Make the DevTools Connectivity lock non reference counted.
To avoid a race on checking if the lock is held.
Change-Id: Iee836447ab0cf6586fa8ece570cc821cd7c6fcd4
Diffstat (limited to 'apps/Development')
| -rw-r--r-- | apps/Development/src/com/android/development/Connectivity.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java index 56504821e..0a6a4ca6d 100644 --- 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 |