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

2022-02-25 02:23:09 +00:00
parent 333c34c434 cd8210843f
commit 894912c85e
1 changed files with 5 additions and 0 deletions
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -949,6 +949,11 @@ public class ConnectivityServiceTest {
        }

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