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

Commit df77ab21 authored by Paul Navin's avatar Paul Navin Committed by android-build-merger
Browse files

Merge "Use PackageManager query instead of permissions review mode booleans."... 

Merge "Use PackageManager query instead of permissions review mode booleans." into cw-f-dev am: c7ed15f3
am: 63329e27

Change-Id: Idfc6f57d22ab2dc4e3cd788634c36dbfda5e13bc
parents 6dd031eb 63329e27

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

+1 −3
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ public final class AppPermissions { 
    }



    public boolean isReviewRequired() {

        if (!mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_permissionReviewRequired)

                && !Build.PERMISSIONS_REVIEW_REQUIRED) {

        if (!mContext.getPackageManager().isPermissionReviewModeEnabled()) {

            return false;

        }

        final int groupCount = mGroups.size();

src/com/android/packageinstaller/permission/ui/television/AllAppPermissionsFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -289,9 +289,7 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
    }



    private boolean isMutableGranularPermission(String name) {

        if (!getResources().getBoolean(

                com.android.internal.R.bool.config_permissionReviewRequired)

                && !Build.PERMISSIONS_REVIEW_REQUIRED) {

        if (!getContext().getPackageManager().isPermissionReviewModeEnabled()) {

            return false;

        }

        switch (name) {

src/com/android/packageinstaller/permission/utils/Utils.java

+1 −2
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ public final class Utils { 
    }



    public static boolean areGroupPermissionsIndividuallyControlled(Context context, String group) {

        if (!context.getResources().getBoolean(

                com.android.internal.R.bool.config_permissionReviewRequired)) {

        if (!context.getPackageManager().isPermissionReviewModeEnabled()) {

            return false;

        }

        return Manifest.permission_group.SMS.equals(group)