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
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java
index 953a500..7ea61fa 100644
--- a/src/com/android/server/connectivity/NetworkMonitor.java
+++ b/src/com/android/server/connectivity/NetworkMonitor.java
@@ -621,7 +621,7 @@
private void notifyNetworkTested(
int result, @Nullable String redirectUrl, PersistableBundle extras) {
try {
- if (mCallbackVersion <= 4) {
+ if (mCallbackVersion <= 5) {
mCallback.notifyNetworkTested(result, redirectUrl);
} else {
mCallback.notifyNetworkTestedWithExtras(