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

Commit d1990faa authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Remove manual pregrants for AttentionService (handled via... 

Merge "Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f93 am: 86c58531" into tm-d1-dev-plus-aosp am: c3fd47cb

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



Change-Id: If42d83d8f581f76724faf2764aaeb4a23af7e1e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47b72fc9 c3fd47cb

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

+0 −8
Original line number Diff line number Diff line
@@ -904,14 +904,6 @@ final class DefaultPermissionGrantPolicy { 
                    COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);

        }



        // Attention Service

        String attentionServicePackageName =

                mContext.getPackageManager().getAttentionServicePackageName();

        if (!TextUtils.isEmpty(attentionServicePackageName)) {

            grantPermissionsToSystemPackage(pm, attentionServicePackageName, userId,

                    CAMERA_PERMISSIONS);

        }



        // There is no real "marker" interface to identify the shared storage backup, it is

        // hardcoded in BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE.

        grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId,