Merge \\"ConnectivityManager: no double callback remove\\" into nyc-mr1-dev am: cde023a3ea
am: e7b50f9ed8
Change-Id: I8fb5bac2bb6b7665192c8c788d7818d637500935
This commit is contained in:
commit
4f03ac8b93
1 changed files with 1 additions and 4 deletions
|
|
@ -3125,14 +3125,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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue