commit 894912c85e2c724cb57d7e488167db106d0f5fc2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 25 02:23:09 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 25 02:23:09 2022 +0000
tree 6202303de07273891adb8752bdf9fe6a5ac8a947
parent 333c34c43497f4f042cad7a81f58236523ce9dbc
parent cd8210843f4c73f350e988cafe50fb3debb5a8b9

Merge "Make sure the right NetworkMonitor start method is called on S-/T+"

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

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 8ec6257..098d48a 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -949,6 +949,11 @@
         }
 
         private void onValidationRequested() throws Exception {
+            if (SdkLevel.isAtLeastT()) {
+                verify(mNetworkMonitor).notifyNetworkConnectedParcel(any());
+            } else {
+                verify(mNetworkMonitor).notifyNetworkConnected(any(), any());
+            }
             if (mNmProvNotificationRequested
                     && ((mNmValidationResult & NETWORK_VALIDATION_RESULT_VALID) != 0)) {
                 mNmCallbacks.hideProvisioningNotification();