LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the DevTools Connectivity lock non reference counted.

Browse Source 
am: a1770e75d0

Change-Id: Ia57f9f3529d29c273795546f4e4b23665be80aaa
This commit is contained in:
Evan Birenbaum
2016-06-27 17:02:30 +00:00
committed by android-build-merger
parent 7bd0dc821e a1770e75d0
commit 0ec12ccca8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/Development/src/com/android/development/Connectivity.java
View File

@@ -406,6 +406,7 @@ public class Connectivity extends Activity {
mWm = (WifiManager)getSystemService(Context.WIFI_SERVICE); mWm = (WifiManager)getSystemService(Context.WIFI_SERVICE);
mWml = mWm.createMulticastLock(TAG); mWml = mWm.createMulticastLock(TAG);
mWml.setReferenceCounted(false);
mPm = (PowerManager)getSystemService(Context.POWER_SERVICE); mPm = (PowerManager)getSystemService(Context.POWER_SERVICE);
mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
@@ -486,9 +487,7 @@ public class Connectivity extends Activity {
mCm.unregisterNetworkCallback(mCallback); mCm.unregisterNetworkCallback(mCallback);
mCallback = null; mCallback = null;
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
if (mWml.isHeld()) { mWml.release();
mWml.release();
}
} }
@Override @Override