Merge "[CM] Fix NPE due to unvalidated callback value" am: 62790fbdfe

am: cc65a628eb

Change-Id: I5a6e2e92852f76251e8c1bfcd3c06c6773ec1fe4

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -3864,6 +3864,7 @@ public class ConnectivityServiceTest {
             }
         }
 
+        testFactory.expectRemoveRequests(1);
         if (preUnregister) {
             mCm.unregisterNetworkCallback(networkCallback);
 
@@ -3873,7 +3874,6 @@ public class ConnectivityServiceTest {
             testFactory.triggerUnfulfillable(requests.get(newRequestId));
         } else {
             // Simulate the factory releasing the request as unfulfillable and expect onUnavailable!
-            testFactory.expectRemoveRequests(1);
             testFactory.triggerUnfulfillable(requests.get(newRequestId));
 
             networkCallback.expectCallback(CallbackState.UNAVAILABLE, null);