diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-16 01:07:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-16 01:07:40 +0000 |
| commit | 233ce9ef453bc7b47f7ac5d0eb1d5fda0ce845ab (patch) | |
| tree | 2c414c5d9ce4ab1099cd73259d912432ac526bdc /tests/vcn/java/com/android/server/VcnManagementServiceTest.java | |
| parent | 379d80ba17a87a4302c6a177f845159880e1536d (diff) | |
| parent | f34c9ede734be8bb831304bfd3a9ba22461cec6d (diff) | |
Snap for 7460608 from f34c9ede734be8bb831304bfd3a9ba22461cec6d to sc-release
Change-Id: Icefa7a959e8b47c6b77e621c924eba895eab3c47
Diffstat (limited to 'tests/vcn/java/com/android/server/VcnManagementServiceTest.java')
| -rw-r--r-- | tests/vcn/java/com/android/server/VcnManagementServiceTest.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java index 3360d40062a3..b7a6d0ff7607 100644 --- a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java +++ b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java @@ -57,6 +57,7 @@ import android.app.AppOpsManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.LinkProperties; import android.net.Network; @@ -707,10 +708,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testAddVcnUnderlyingNetworkPolicyListenerInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener); } @@ -724,10 +724,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testRemoveVcnUnderlyingNetworkPolicyListenerInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener); } @@ -919,10 +918,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testGetUnderlyingNetworkPolicyInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.getUnderlyingNetworkPolicy(new NetworkCapabilities(), new LinkProperties()); } |