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

Commit 1c49cd8f authored by Greg Kaiser's avatar Greg Kaiser Committed by Automerger Merge Worker
Browse files

Merge "Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"" into... 

Merge "Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"" into tm-dev am: 375d7c41 am: 2e80d2d1 am: 01f3f300

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17912430



Change-Id: I1b2ca127a2b97ea4db21a614de228f0c2cb948f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be88220a 01f3f300

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+6 −16
Original line number Diff line number Diff line
@@ -195,11 +195,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 


    /** All storage permissions */

    private static final List<String> STORAGE_PERMISSIONS = new ArrayList<>();



    private static final Set<String> READ_MEDIA_AURAL_PERMISSIONS = new ArraySet<>();



    private static final Set<String> READ_MEDIA_VISUAL_PERMISSIONS = new ArraySet<>();



    /** All nearby devices permissions */

    private static final List<String> NEARBY_DEVICES_PERMISSIONS = new ArrayList<>();
@@ -227,10 +222,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                Manifest.permission.INTERACT_ACROSS_USERS_FULL);

        STORAGE_PERMISSIONS.add(Manifest.permission.READ_EXTERNAL_STORAGE);

        STORAGE_PERMISSIONS.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);

        READ_MEDIA_AURAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_AUDIO);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VIDEO);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.ACCESS_MEDIA_LOCATION);

        STORAGE_PERMISSIONS.add(Manifest.permission.ACCESS_MEDIA_LOCATION);

        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_AUDIO);

        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES);

        STORAGE_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VIDEO);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_ADVERTISE);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_CONNECT);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_SCAN);
@@ -2075,10 +2070,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                PermissionInfo permInfo = getPermissionInfo(

                        newPackage.getRequestedPermissions().get(i),

                        newPackage.getPackageName(), 0);

                boolean isStorageOrMedia = STORAGE_PERMISSIONS.contains(permInfo.name)

                        || READ_MEDIA_AURAL_PERMISSIONS.contains(permInfo.name)

                        || READ_MEDIA_VISUAL_PERMISSIONS.contains(permInfo.name);

                if (permInfo == null || !isStorageOrMedia) {

                if (permInfo == null || !STORAGE_PERMISSIONS.contains(permInfo.name)) {

                    continue;

                }
@@ -3152,9 +3144,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                }

                if (bp.isRuntime()) {



                    if (!(newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)

                            || READ_MEDIA_AURAL_PERMISSIONS.contains(newPerm)

                            || READ_MEDIA_VISUAL_PERMISSIONS.contains(newPerm))) {

                    if (!newPerm.equals(Manifest.permission.ACTIVITY_RECOGNITION)) {

                        ps.updatePermissionFlags(bp,

                                FLAG_PERMISSION_REVOKE_WHEN_REQUESTED,

                                FLAG_PERMISSION_REVOKE_WHEN_REQUESTED);