Merge "Clean up unit testing for ConnectivityDiagnostics." am: dc95e0198b am: f68f0b144e am: bd48f4f180 am: 9ee80b2a34

Change-Id: If31027920ff925d0043b59bb128cf042a329183f
This commit is contained in:
Automerger Merge Worker
2020-03-16 20:23:45 +00:00

View File

@@ -6797,15 +6797,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