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

Commit 1f67bac3 authored by Cody Kesting's avatar Cody Kesting Committed by Gerrit Code Review
Browse files

Merge "Update version check for notifyNetworkTested() call."

parents f998552c 2b26c8b9

src/com/android/server/connectivity/NetworkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ public class NetworkMonitor extends StateMachine { 
    private void notifyNetworkTested(

            int result, @Nullable String redirectUrl, PersistableBundle extras) {

        try {

            if (mCallbackVersion <= 5) {

            if (mCallbackVersion <= 4) {

                mCallback.notifyNetworkTested(result, redirectUrl);

            } else {

                mCallback.notifyNetworkTestedWithExtras(

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1425,7 +1425,7 @@ public class NetworkMonitorTest { 
    public void testNotifyNetwork_NotifyNetworkTestedOldInterfaceVersion() throws Exception {

        // Use old interface version so notifyNetworkTested is used over

        // notifyNetworkTestedWithExtras

        resetCallbacks(5);

        resetCallbacks(4);



        // Trigger Network validation

        setStatus(mHttpsConnection, 204);