commit 8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36
author Shishir Agrawal <shishir@google.com> Thu Jul 30 18:54:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 30 18:54:49 2015 +0000
tree 44effec17693f80a85a4f710a63d91341bf49e31
parent 74a0744ec19de54096638978bfe1eccfe2ed4e01
parent ad63247690a5082a74891cd16278f6c2ba8760c6

Merge "Add SMS permissions for Carrier app." into mnc-dev

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

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 @@
                     && doesPackageSupportRuntimePermissions(carrierPackage)) {
                 grantRuntimePermissionsLPw(carrierPackage, PHONE_PERMISSIONS, userId);
                 grantRuntimePermissionsLPw(carrierPackage, LOCATION_PERMISSIONS, userId);
+                grantRuntimePermissionsLPw(carrierPackage, SMS_PERMISSIONS, userId);
             }
         }
     }