LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up unit testing for ConnectivityDiagnostics.

Browse Source 
Connectivity Diagnostics included an unnecessary try-catch for verifying
that the permissions check for invoking ConnectivityDiagnosticsCallbacks
doesn't throw when the uid and package name do not match.

Bug: 149119324
Test: atest FrameworksNetTests
Change-Id: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
Merged-In: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
(cherry picked from commit 66b5e081b785a3b7e2a032342d4d424905581cf9)
This commit is contained in:
Automerger Merge Worker
2020-03-16 20:37:44 +00:00
committed by Cody Kesting
parent cf7bb0ee06
commit 21105c9771
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

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