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

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

Change-Id: I9c4b84479f2ed1d154b322dfc2911babb8b38479
This commit is contained in:
Treehugger Robot 2022-02-25 02:59:40 +00:00 • committed by Automerger Merge Worker
commit cee5a4fdba

View file

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