Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db64cdf9 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Restricted permission whitelisted by default - PermissionController" into qt-dev 

am: 3fdc68db

Change-Id: Ice777c395d20909213776b0fee080fbe9cff7fc5
parents cb97e186 3fdc68db

src/com/android/packageinstaller/Constants.java

+0 −3
Original line number Diff line number Diff line
@@ -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}.

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

                }

            }