From d0636e18d82d370942b57c4e8b86b29c5c45b6ec Mon Sep 17 00:00:00 2001 From: Rodrigo Lagos Date: Tue, 28 Sep 2021 23:12:09 -0700 Subject: [PATCH] Add pre-grant bluetooth permissions for AUTOMOTIVE SetupWizard Bug: 201417592 Test: Tested on local builds Change-Id: I156c990d95b92295da5ede28aaea67f1aa63b596 --- .../server/pm/permission/DefaultPermissionGrantPolicy.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 010c28457713e..0e939efd3a74c 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -558,10 +558,12 @@ final class DefaultPermissionGrantPolicy { // SetupWizard final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages( - PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId)); + PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId)); grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS, CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS); - if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0)) { + if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0) + || mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, + 0)) { grantPermissionsToSystemPackage( pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS); }