Restricted permission whitelisted by default - PermissionController

To ensure existing installers would work without a change the
default state of installing a package is now that all restricted
permissions are whitelisted. If the installer specifies another
whitelist at install time, it determines the install state. In
addition to this we now enable the restricted permission checks
as a prebuilt installer is no longer required.

Test: atest CtsPermission2TestCases
Test: atest CtsPermissionTestCases
Test: atest CtsAppSecurityTestCases:android.appsecurity.cts.PermissionsHostTest

bug:132160728

Change-Id: I5634a27c21062b5f1a85de101fa2e1f0d29a1865

2 files changed, 2 insertions, 7 deletions

diff --git a/src/com/android/packageinstaller/Constants.java b/src/com/android/packageinstaller/Constants.java
index ae23b307..c3d7f86a 100644
--- a/src/com/android/packageinstaller/Constants.java
+++ b/src/com/android/packageinstaller/Constants.java
@@ -21,9 +21,6 @@ package com.android.packageinstaller;
  */
 public class Constants {
 
-    // STOPSHIP: Remove this once we get a Play prebuilt.
-    public static boolean RESTRICTED_PERMISSIONS_ENABLED = false;
-
     /**
      * ID for the periodic job in
      * {@link com.android.packageinstaller.permission.service.LocationAccessCheck}.
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 83bc4570..fab23d01 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -44,7 +44,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import com.android.packageinstaller.Constants;
 import com.android.packageinstaller.permission.service.LocationAccessCheck;
 import com.android.packageinstaller.permission.utils.ArrayUtils;
 import com.android.packageinstaller.permission.utils.LocationUtils;
@@ -342,9 +341,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
 
                 group.getBackgroundPermissions().addPermission(permission);
             } else {
-                if (!Constants.RESTRICTED_PERMISSIONS_ENABLED
-                        || (!permission.isHardRestricted()
-                            || whitelistedRestrictedPermissions.contains(permission.getName()))) {
+                if (!permission.isHardRestricted()
+                            || whitelistedRestrictedPermissions.contains(permission.getName())) {
                     group.addPermission(permission);
                 }
             }