diff options
| author | 2022-05-23 03:31:53 +0000 | |
|---|---|---|
| committer | 2022-05-23 03:31:53 +0000 | |
| commit | d42a883b31c2ccc8237cf6b95820ac587ab0fda2 (patch) | |
| tree | 9cf6e0a9096fb486855e2f8c403ddda19da28f6f | |
| parent | 0e0fd1d82899ca4937f961257678378cd2096a2e (diff) | |
| parent | 8df23b2b27b909f4c998b2631ed22c69ee774206 (diff) | |
Merge "Pregrant the nearby device permisison for SetupWizard." into tm-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java | 9 |
1 files changed, 2 insertions, 7 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 67960655b618..cc1c943c2540 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -603,15 +603,10 @@ final class DefaultPermissionGrantPolicy { final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages( KnownPackages.PACKAGE_SETUP_WIZARD, userId)); grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS, - CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS); + CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS, + NEARBY_DEVICES_PERMISSIONS); grantSystemFixedPermissionsToSystemPackage(pm, setupWizardPackage, userId, NOTIFICATION_PERMISSIONS); - if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH, 0) - || mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, - 0)) { - grantPermissionsToSystemPackage( - pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS); - } // SearchSelector grantPermissionsToSystemPackage(pm, getDefaultSearchSelectorPackage(), userId, |