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

Commit 82808cb4 authored by Cody Kesting's avatar Cody Kesting
Browse files

Update NetworkStack version check in NetworkMonitor. 

NetworkMonitor calls INetworkMonitorCallbacks#notifyNetworkTested when
network validation is complete. NetworkMonitor will transition to using
to NetworkStack Stable AIDL version 6. However, the current version
check changes behavior for version 5, which is incorrect.

Bug: 152931568
Test: atest NetworkStackTests
Change-Id: Ib88b8b0c0b23079287e72e50cbe840fa8c642047
parent b844596d

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

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

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

        try {

            if (mCallbackVersion <= 4) {

            if (mCallbackVersion <= 5) {

                mCallback.notifyNetworkTested(result, redirectUrl);

            } else {

                mCallback.notifyNetworkTestedWithExtras(