joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests 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
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");
}
try {
// CallbackHandler will release callback when receiving CALLBACK_RELEASED.
mService.releaseNetworkRequest(networkCallback.networkRequest);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
synchronized (sNetworkCallback) {
sNetworkCallback.remove(networkCallback.networkRequest);
}
}
/**