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

Merge "Add Activity Recognition to default grants for Home app on Wear." am: 0bcfa16d6c

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

Change-Id: Id7e001fccc0ab543f9b1bb3ee71cb5acb55fdbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shreerag Jayakrishnan
2022-05-04 15:26:07 +00:00
committed by Automerger Merge Worker
parent 14a7d644a3 0bcfa16d6c
commit bb96289dea
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -790,7 +790,8 @@ final class DefaultPermissionGrantPolicy {
Intent.CATEGORY_HOME_MAIN, userId); Intent.CATEGORY_HOME_MAIN, userId);
grantPermissionsToSystemPackage(pm, wearPackage, userId, grantPermissionsToSystemPackage(pm, wearPackage, userId,
CONTACTS_PERMISSIONS, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS); CONTACTS_PERMISSIONS, MICROPHONE_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS);
grantSystemFixedPermissionsToSystemPackage(pm, wearPackage, userId, PHONE_PERMISSIONS); grantSystemFixedPermissionsToSystemPackage(pm, wearPackage, userId, PHONE_PERMISSIONS,
ACTIVITY_RECOGNITION_PERMISSIONS);
// Fitness tracking on watches // Fitness tracking on watches
if (mContext.getResources().getBoolean(R.bool.config_trackerAppNeedsPermissions)) { if (mContext.getResources().getBoolean(R.bool.config_trackerAppNeedsPermissions)) {