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

Commit 36c85684 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky Committed by Automerger Merge Worker
Browse files

Merge "Remove manual pregrants for ContentCaptureService (now handled via... 

Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev am: 18a113c4

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



Change-Id: Iac2ce754d8d1b138d87674ccb0d0cf3291416f51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3307cc0e 18a113c4

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

+0 −9
Original line number Original line Diff line number Diff line
@@ -903,15 +903,6 @@ final class DefaultPermissionGrantPolicy { 
                    COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);

                    COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);

        }

        }





        // Content capture

        String contentCapturePackageName =

                mContext.getPackageManager().getContentCaptureServicePackageName();

        if (!TextUtils.isEmpty(contentCapturePackageName)) {

            grantPermissionsToSystemPackage(pm, contentCapturePackageName, userId,

                    PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,

                    CONTACTS_PERMISSIONS, STORAGE_PERMISSIONS);

        }



        // Attention Service

        // Attention Service

        String attentionServicePackageName =

        String attentionServicePackageName =

                mContext.getPackageManager().getAttentionServicePackageName();

                mContext.getPackageManager().getAttentionServicePackageName();