summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/pm
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-10-22 17:22:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-22 17:22:21 +0000
commit0a3270e00ab6bbba5669288f958cc88c8484a587 (patch)
treea0e39db4a0332eb8c779043ba7a6a7986e59d13b /services/core/java/com/android/server/pm
parent6649ee972b2bfbeca2d664cfd6629810ebbc7ac8 (diff)
parent90814f0006a8d4102870891b001183ef84b314e5 (diff)
downloadframeworks_base-0a3270e00ab6bbba5669288f958cc88c8484a587.zip
frameworks_base-0a3270e00ab6bbba5669288f958cc88c8484a587.tar.gz
frameworks_base-0a3270e00ab6bbba5669288f958cc88c8484a587.tar.bz2
Merge "Give watch Home app location permissions by default" into cw-e-dev
Diffstat (limited to 'services/core/java/com/android/server/pm')
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 4f61db9..8abc8fc 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -586,6 +586,8 @@ final class DefaultPermissionGrantPolicy {
grantRuntimePermissionsLPw(wearHomePackage, PHONE_PERMISSIONS, true, userId);
grantRuntimePermissionsLPw(wearHomePackage, MICROPHONE_PERMISSIONS, false,
userId);
+ grantRuntimePermissionsLPw(wearHomePackage, LOCATION_PERMISSIONS, false,
+ userId);
}
}