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

Commit 0261df76 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Grant NEARBY_DEVICES to voice interaction." into sc-dev am: 4dba7e33 

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

Change-Id: I17af9edcce4c0ed557eb87b7a5a8c88f4622bdfe
parents 053273da 4dba7e33

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -720,7 +720,8 @@ final class DefaultPermissionGrantPolicy { 
            for (String voiceInteractPackageName : voiceInteractPackageNames) {

            for (String voiceInteractPackageName : voiceInteractPackageNames) {

                grantPermissionsToSystemPackage(pm, voiceInteractPackageName, userId,

                grantPermissionsToSystemPackage(pm, voiceInteractPackageName, userId,

                        CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,

                        CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,

                        PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);

                        PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,

                        NEARBY_DEVICES_PERMISSIONS);

            }

            }

        }

        }