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

Commit 86c58531 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky Committed by Automerger Merge Worker
Browse files

Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f93 

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



Change-Id: I257608b4572659d4b2830846b178d38b45b7aa01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0884b26 0f9f5f93

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,