diff options
| author | Paul Hu <paulhu@google.com> | 2021-11-29 03:45:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-29 03:45:46 +0000 |
| commit | b0a10cd127851d25af8d7e2ce8e5434fd6c95c03 (patch) | |
| tree | 196667f2dcbe02268de76a4ee633501fa4fcc8fc /tests/unit/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 2797722d0c9d9c4436f622d2810bec87e0f48219 (diff) | |
| parent | 6fafdc15484bd7566450738d2816c7dd90d35993 (diff) | |
Merge "Save uid netd network permissions" am: 6fafdc1548
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773890
Change-Id: Ibff437f91017017cc6fcc7e456e621e2ad81995a
Diffstat (limited to 'tests/unit/java/com/android/server/ConnectivityServiceTest.java')
| -rw-r--r-- | tests/unit/java/com/android/server/ConnectivityServiceTest.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 5493e9bb4c..044ff0204b 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -38,7 +38,6 @@ import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED; import static android.content.pm.PackageManager.FEATURE_WIFI; import static android.content.pm.PackageManager.FEATURE_WIFI_DIRECT; import static android.content.pm.PackageManager.GET_PERMISSIONS; -import static android.content.pm.PackageManager.MATCH_ANY_USER; import static android.content.pm.PackageManager.PERMISSION_DENIED; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.net.ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN; @@ -2006,7 +2005,7 @@ public class ConnectivityServiceTest { buildPackageInfo(/* SYSTEM */ false, APP1_UID), buildPackageInfo(/* SYSTEM */ false, APP2_UID), buildPackageInfo(/* SYSTEM */ false, VPN_UID) - })).when(mPackageManager).getInstalledPackages(eq(GET_PERMISSIONS | MATCH_ANY_USER)); + })).when(mPackageManager).getInstalledPackagesAsUser(eq(GET_PERMISSIONS), anyInt()); // Create a fake always-on VPN package. final int userId = UserHandle.getCallingUserId(); @@ -3334,7 +3333,7 @@ public class ConnectivityServiceTest { private void grantUsingBackgroundNetworksPermissionForUid( final int uid, final String packageName) throws Exception { doReturn(buildPackageInfo(true /* hasSystemPermission */, uid)).when(mPackageManager) - .getPackageInfo(eq(packageName), eq(GET_PERMISSIONS | MATCH_ANY_USER)); + .getPackageInfo(eq(packageName), eq(GET_PERMISSIONS)); mService.mPermissionMonitor.onPackageAdded(packageName, uid); } |