commit 9e249ff7bb0fda0ae297d61ff7a7fa7b027833d7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 25 03:21:44 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 25 03:21:44 2022 +0000
tree 86fa5c67efc3bf72f1cee33a0444311fb55f4dd0
parent a52b88474fccfac457eb08a73d12cbf9a39cdb14
parent cee5a4fdbac287e4c2559b8cf1995639278ad6dd

Merge "Make sure the right NetworkMonitor start method is called on S-/T+" am: 894912c85e am: cee5a4fdba

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1995390

Change-Id: Ic54b49109db259c31c830e1969bcc0485e8c14fb

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();