Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a1c61f3 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[CM] Fix NPE due to unvalidated callback value" am: 1b7640a7 am: cc65a628 

am: 8e4ebb79

Change-Id: Iecfa40fe34c2054d58a9e8239b855c1a831764c0
parents 4ca0181e 8e4ebb79

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

+1 −1
Original line number Diff line number Diff line
@@ -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);