commit 3f857fd66d0d9e5011dae8746b406d10f7072797
author Hai Zhang <zhanghai@google.com> Thu Aug 04 06:09:18 2022 +0000
committer Hai Zhang <zhanghai@google.com> Thu Aug 04 06:09:51 2022 +0000
tree c6f10d30557066c0b72f4e054c0d84d4800794da
parent 8942ae3232bd3d22cf7d1bcb1c17a9b9bddcda18

Use GRANTED_BY_ROLE instead of GRANTED_BY_DEFAULT for system browser.

The two flags are not that different, and other roles are all using
GRANTED_BY_ROLE for system app pregrants, so let's just keep using
GRANTED_BY_ROLE for consistency.

See also b/239498967#comment13 - we provided a platform patch there as a
quick fix, but in the long run I think always using GRANTED_BY_ROLE
makes more sense.

Test: presubmit
Change-Id: I500d9de0f77a98b00a8d237ca09368ef27ca0281

PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java

diff --git a/PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java
index 9d4d9e0..1099835 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java
@@ -136,8 +136,8 @@
         //      #grantDefaultPermissionsToDefaultBrowser(java.lang.String, int)
         if (SdkLevel.isAtLeastS()) {
             if (PackageUtils.isSystemPackage(packageName, context)) {
-                Permissions.grant(packageName, SYSTEM_BROWSER_PERMISSIONS, false, false, false,
-                        true, false, context);
+                Permissions.grant(packageName, SYSTEM_BROWSER_PERMISSIONS, false, false, true,
+                        false, false, context);
             }
         }
     }
@@ -146,7 +146,7 @@
     public void revoke(@NonNull Role role, @NonNull String packageName, @NonNull Context context) {
         if (SdkLevel.isAtLeastT()) {
             if (PackageUtils.isSystemPackage(packageName, context)) {
-                Permissions.revoke(packageName, SYSTEM_BROWSER_PERMISSIONS, false, true, false,
+                Permissions.revoke(packageName, SYSTEM_BROWSER_PERMISSIONS, true, false, false,
                         context);
             }
         }