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

Revert "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CON..."

Browse Source 
Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."

Revert submission 2141595-GRANT_PLATFORM_VPN

Reason for revert: Refer to the comment in ag/19491935.
Reverted Changes:
I0e0566bb8:Grant the ACTIVATE_PLATFORM_VPN appop if VPN app h...
I0580baca6:Test if VPN app can grant ACTIVATE_PLATFORM_VPN wi...

Change-Id: I9208fc124a5d37014b28e531da271e43e47c165a
This commit is contained in:
Lucas Lin
2022-08-17 06:31:29 +00:00
parent 31dcf69b74
commit 1d68ed690d
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -928,31 +928,6 @@ public class VpnTest {
AppOpsManager.OPSTR_ACTIVATE_PLATFORM_VPN, AppOpsManager.OPSTR_ACTIVATE_VPN);
}
private void setAppOpsPermission() {
doAnswer(invocation -> {
when(mAppOps.noteOpNoThrow(AppOpsManager.OPSTR_ACTIVATE_PLATFORM_VPN,
Process.myUid(), TEST_VPN_PKG,
null /* attributionTag */, null /* message */))
.thenReturn(AppOpsManager.MODE_ALLOWED);
return null;
}).when(mAppOps).setMode(
eq(AppOpsManager.OPSTR_ACTIVATE_PLATFORM_VPN),
eq(Process.myUid()),
eq(TEST_VPN_PKG),
eq(AppOpsManager.MODE_ALLOWED));
}
@Test
public void testProvisionVpnProfileNotPreconsented_withControlVpnPermission() throws Exception {
setAppOpsPermission();
doReturn(PERMISSION_GRANTED).when(mContext).checkCallingOrSelfPermission(CONTROL_VPN);
final Vpn vpn = createVpnAndSetupUidChecks();
// ACTIVATE_PLATFORM_VPN will be granted if VPN app has CONTROL_VPN permission.
checkProvisionVpnProfile(vpn, true /* expectedResult */,
AppOpsManager.OPSTR_ACTIVATE_PLATFORM_VPN);
}
@Test
public void testProvisionVpnProfileVpnServicePreconsented() throws Exception {
final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OPSTR_ACTIVATE_VPN);