summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shishir Agrawal <shishir@google.com> 2015-07-30 19:16:21 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-30 19:16:21 +0000
commit124eb8dc36ff6f6a33b9e40a402808da7ecf487c (patch)
tree47e0ae9402dd4dde33fac6efa48263274f7903ca
parente5b259151d6a0ba116f76382526423dd3c745960 (diff)
parent6635cccec9d9d37db2bcab3cada543056203c919 (diff)
am 6635ccce: am f9dee583: am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev
* commit '6635cccec9d9d37db2bcab3cada543056203c919': 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 62783714e03e..669b8e5b21be 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);
}
}
}