commit fbd2bcbfec0e6d70306e19a9a7788dc99ef54a42
author Junda Liu <junda@google.com> Wed Jun 15 11:15:42 2016 -0700
committer Junda Liu <junda@google.com> Wed Jun 15 16:09:51 2016 -0700
tree d6c82f2d6895c5ea582ea432ffb6604289d32174
parent 0c34424c65b8d51ee1c724bd2ea8ade50b9d3c7a

Allow system privileged app to notify carrier config changed.

The app needs to have MODIFY_PHONE_STATE permission.

Bug: b/28090195
Change-Id: Ibeae3865a94720a183f34e991796fe272691b946

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 3204a9f..5a40322 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -665,9 +665,11 @@
         // TODO: Check that the calling packages is privileged for subId specifically.
         int privilegeStatus = TelephonyManager.from(mContext).checkCarrierPrivilegesForPackage(
                 callingPackageName);
+        // Requires the calling app to be either a carrier privileged app or
+        // system privileged app with MODIFY_PHONE_STATE permission.
         if (privilegeStatus != TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
-            throw new SecurityException(
-                    "Package is not privileged for subId=" + subId + ": " + callingPackageName);
+            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE,
+                    "Require carrier privileges or MODIFY_PHONE_STATE permission.");
         }
 
         // This method should block until deleting has completed, so that an error which prevents us