Merge "[CS] Unregister callback as part of onUnavailable dispatch" am: e2ba92c411

am: 477211720f Change-Id: Ida684c441e7aaedce9a29da071ef5a68403d08b3
2019-05-08 22:42:55 -07:00
parent 65365f4320 477211720f
commit abc0036a8b
2 changed files with 11 additions and 2 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -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();
    }