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

Commit 98bee8d3 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d0983285... 

Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum" am: d0983285 am: 104b2bcc am: 4071792c
am: e4cf6229

Change-Id: I65c210d8f0ee27540339233d45def0c464920aea
parents ad90a766 e4cf6229

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

+3 −0
Original line number Diff line number Diff line
@@ -3296,12 +3296,14 @@ public class ConnectivityServiceTest { 
            mCm.requestNetwork(networkRequest, networkCallback);

            mCm.unregisterNetworkCallback(networkCallback);

        }

        waitForIdle();



        for (int i = 0; i < MAX_REQUESTS; i++) {

            NetworkCallback networkCallback = new NetworkCallback();

            mCm.registerNetworkCallback(networkRequest, networkCallback);

            mCm.unregisterNetworkCallback(networkCallback);

        }

        waitForIdle();



        for (int i = 0; i < MAX_REQUESTS; i++) {

            PendingIntent pendingIntent =
@@ -3309,6 +3311,7 @@ public class ConnectivityServiceTest { 
            mCm.requestNetwork(networkRequest, pendingIntent);

            mCm.unregisterNetworkCallback(pendingIntent);

        }

        waitForIdle();



        for (int i = 0; i < MAX_REQUESTS; i++) {

            PendingIntent pendingIntent =