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

Commit 09e64597 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Further default grants for notifications"

parents 01cdb0a5 fae74169

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

+4 −3
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ final class DefaultPermissionGrantPolicy { 
        grantPermissionsToSystemPackage(pm,

                getDefaultSystemHandlerActivityPackage(pm,

                        DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE, userId),

                userId, CONTACTS_PERMISSIONS);

                userId, CONTACTS_PERMISSIONS, NOTIFICATION_PERMISSIONS);



        // Maps

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, 0)) {
@@ -775,7 +775,7 @@ final class DefaultPermissionGrantPolicy { 
                grantPermissionsToSystemPackage(pm, voiceInteractPackageName, userId,

                        CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,

                        PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,

                        NEARBY_DEVICES_PERMISSIONS);

                        NEARBY_DEVICES_PERMISSIONS, NOTIFICATION_PERMISSIONS);

            }

        }
@@ -784,7 +784,8 @@ final class DefaultPermissionGrantPolicy { 
            grantPermissionsToSystemPackage(pm,

                    getDefaultSystemHandlerActivityPackage(pm,

                            SearchManager.INTENT_ACTION_GLOBAL_SEARCH, userId),

                    userId, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);

                    userId, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,

                    NOTIFICATION_PERMISSIONS);

        }



        // Voice recognition