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

Merge "Add pre-grant bluetooth permissions for AUTOMOTIVE SetupWizard" into sc-qpr1-dev am: 773a974b8a

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

Change-Id: Ifdcf74d748e319ad09e1460ff74a341d7095e08d
This commit is contained in:
Rodrigo Lagos
2021-10-07 13:37:33 +00:00
committed by Automerger Merge Worker
parent 49327062c2 773a974b8a
commit 5250bc61b0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,11 +557,14 @@ final class DefaultPermissionGrantPolicy {
grantPermissionsToSystemPackage(pm, verifier, userId, PHONE_PERMISSIONS, SMS_PERMISSIONS);
// SetupWizard
grantPermissionsToSystemPackage(pm,
ArrayUtils.firstOrNull(getKnownPackages(
PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId)), userId,
PHONE_PERMISSIONS, CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
CAMERA_PERMISSIONS);
final String setupWizardPackage = ArrayUtils.firstOrNull(getKnownPackages(
PackageManagerInternal.PACKAGE_SETUP_WIZARD, userId));
grantPermissionsToSystemPackage(pm, setupWizardPackage, userId, PHONE_PERMISSIONS,
CONTACTS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS, CAMERA_PERMISSIONS);
if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, 0)) {
grantPermissionsToSystemPackage(
pm, setupWizardPackage, userId, NEARBY_DEVICES_PERMISSIONS);
}
// Camera
grantPermissionsToSystemPackage(pm,