Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 26177212ed

Change-Id: Icff8ed1cf90927e521c8294aaec8bfdd6a4ccc4d
This commit is contained in:
Cody Kesting
2020-03-27 19:23:37 +00:00
committed by Automerger Merge Worker

View File

@@ -6810,15 +6810,11 @@ public class ConnectivityServiceTest {
mServiceContext.setPermission(android.Manifest.permission.NETWORK_STACK, PERMISSION_DENIED);
try {
assertFalse(
"Mismatched uid/package name should not pass the location permission check",
mService.checkConnectivityDiagnosticsPermissions(
Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,
mContext.getOpPackageName()));
} catch (SecurityException e) {
fail("checkConnectivityDiagnosticsPermissions shouldn't surface a SecurityException");
}
assertFalse(
"Mismatched uid/package name should not pass the location permission check",
mService.checkConnectivityDiagnosticsPermissions(
Process.myPid() + 1, Process.myUid() + 1, naiWithoutUid,
mContext.getOpPackageName()));
}
@Test