Merge "Make sure the right NetworkMonitor start method is called on S-/T+"
This commit is contained in:
@@ -949,6 +949,11 @@ public class ConnectivityServiceTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void onValidationRequested() throws Exception {
|
private void onValidationRequested() throws Exception {
|
||||||
|
if (SdkLevel.isAtLeastT()) {
|
||||||
|
verify(mNetworkMonitor).notifyNetworkConnectedParcel(any());
|
||||||
|
} else {
|
||||||
|
verify(mNetworkMonitor).notifyNetworkConnected(any(), any());
|
||||||
|
}
|
||||||
if (mNmProvNotificationRequested
|
if (mNmProvNotificationRequested
|
||||||
&& ((mNmValidationResult & NETWORK_VALIDATION_RESULT_VALID) != 0)) {
|
&& ((mNmValidationResult & NETWORK_VALIDATION_RESULT_VALID) != 0)) {
|
||||||
mNmCallbacks.hideProvisioningNotification();
|
mNmCallbacks.hideProvisioningNotification();
|
||||||
|
|||||||
Reference in New Issue
Block a user