Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pregrant the nearby device permisison for SetupWizard." into tm-dev am: d42a883b31 am: 1244a5a2d0

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

Change-Id: Ic19107bbaa7cfc4392c06e008bc50d2393580d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Li
2022-05-23 04:00:15 +00:00
committed by Automerger Merge Worker
parent 0fbc582646 1244a5a2d0
commit b8f5810ee9
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
View File

@@ -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,