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

Pregrant the nearby device permisison for SetupWizard.

Browse Source 
Bug: 231400126
Test: manual
Change-Id: I36f38bf2565eb25dbe52d490ff1a18bc2d396cf3
This commit is contained in:
alexylli
2022-05-05 12:53:52 +08:00
parent ac3033fd40
commit 8df23b2b27
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,