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

Merge "ConnectivityManager: no double callback remove" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-07 09:33:34 +00:00
committed by Android (Google) Code Review
parent ef9c83a171 f778e2546f
commit 0ecfb2fd34
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/ConnectivityManager.java
View File

@@ -3103,14 +3103,11 @@ public class ConnectivityManager {
throw new IllegalArgumentException("Invalid NetworkCallback"); throw new IllegalArgumentException("Invalid NetworkCallback");
} }
try { try {
// CallbackHandler will release callback when receiving CALLBACK_RELEASED.
mService.releaseNetworkRequest(networkCallback.networkRequest); mService.releaseNetworkRequest(networkCallback.networkRequest);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
synchronized (sNetworkCallback) {
sNetworkCallback.remove(networkCallback.networkRequest);
}
} }
/** /**