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 "[CS] Unregister callback as part of onUnavailable dispatch"

Browse source 
am: e2ba92c411

Change-Id: I14d3c0f6c606020bd1d1e756174a66ee933cb15f
This commit is contained in:
Etan Cohen 2019-05-08 22:13:00 -07:00 • committed by android-build-merger
commit 477211720f
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/java/android/net/ConnectivityManager.java
View file

@ -3449,6 +3449,10 @@ public class ConnectivityManager {
final NetworkCallback callback;
synchronized (sCallbacks) {
callback = sCallbacks.get(request);
if (message.what == CALLBACK_UNAVAIL) {
sCallbacks.remove(request);
callback.networkRequest = ALREADY_UNREGISTERED;
}
}
if (DBG) {
Log.d(TAG, getCallbackName(message.what) + " for network " + network);
@ -3995,8 +3999,10 @@ public class ConnectivityManager {
synchronized (sCallbacks) {
Preconditions.checkArgument(networkCallback.networkRequest != null,
"NetworkCallback was not registered");
Preconditions.checkArgument(networkCallback.networkRequest != ALREADY_UNREGISTERED,
"NetworkCallback was already unregistered");
if (networkCallback.networkRequest == ALREADY_UNREGISTERED) {
Log.d(TAG, "NetworkCallback was already unregistered");
return;
}
for (Map.Entry<NetworkRequest, NetworkCallback> e : sCallbacks.entrySet()) {
if (e.getValue() == networkCallback) {
reqs.add(e.getKey());

3
tests/net/java/com/android/server/ConnectivityServiceTest.java
View file

@ -3854,6 +3854,9 @@ public class ConnectivityServiceTest {
networkCallback.expectCallback(CallbackState.UNAVAILABLE, null);
testFactory.waitForRequests();
// unregister network callback - a no-op, but should not fail
mCm.unregisterNetworkCallback(networkCallback);
testFactory.unregister();
handlerThread.quit();
}