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

Commit abe0e088 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "Add Bluetooth toggle prompts - package installer" am: 4e2a5109 am: 6e20ff3d 

am: f8a55b8f

Change-Id: I18786f0c0a5131a406e8aee92a5c9268e5fb5ea2
parents 3a7c135d f8a55b8f

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

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



    public boolean isReviewRequired() {

        if (!Build.PERMISSIONS_REVIEW_REQUIRED) {

        if (!mContext.getResources().getBoolean(

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

                && !Build.PERMISSIONS_REVIEW_REQUIRED) {

            return false;

        }

        final int groupCount = mGroups.size();

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

+4 −2
Original line number Diff line number Diff line
@@ -288,8 +288,10 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
        return Utils.applyTint(context, icon, android.R.attr.colorControlNormal);

    }



    private static boolean isMutableGranularPermission(String name) {

        if (!Build.PERMISSIONS_REVIEW_REQUIRED) {

    private boolean isMutableGranularPermission(String name) {

        if (!getResources().getBoolean(

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

                && !Build.PERMISSIONS_REVIEW_REQUIRED) {

            return false;

        }

        switch (name) {