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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index c29cea4..18b8c77 100644
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -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(
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index f861a44..64a8485 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -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);