summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShishir Agrawal <shishir@google.com>2015-07-30 19:01:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-30 19:01:49 +0000
commitf9dee58395fa72dc3764292aef4937dfcca0a14a (patch)
tree3638938e2d918ce28179b26a01583d035e9f4ce0
parent4de7b0ffb06053183d991705b113fb9fe3c9075b (diff)
parent8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36 (diff)
downloadframeworks_base-f9dee58395fa72dc3764292aef4937dfcca0a14a.zip
frameworks_base-f9dee58395fa72dc3764292aef4937dfcca0a14a.tar.gz
frameworks_base-f9dee58395fa72dc3764292aef4937dfcca0a14a.tar.bz2
am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev
* commit '8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36': Add SMS permissions for Carrier app.
-rw-r--r--services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java1
1 files changed, 1 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 6278371..669b8e5 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -634,6 +634,7 @@ final class DefaultPermissionGrantPolicy {
&& doesPackageSupportRuntimePermissions(carrierPackage)) {
grantRuntimePermissionsLPw(carrierPackage, PHONE_PERMISSIONS, userId);
grantRuntimePermissionsLPw(carrierPackage, LOCATION_PERMISSIONS, userId);
+ grantRuntimePermissionsLPw(carrierPackage, SMS_PERMISSIONS, userId);
}
}
}