commit 9ebf595b977b1f45f0bd42ce675fd5efed9f9949
author Junda Liu <junda@google.com> Fri Jun 19 20:31:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 20:32:01 2015 +0000
tree c2518cb0eb6a70f72ff3b96c6f957da9cdd7e5aa
parent 3799257f8928b41d3d1b911d213fa4b4eb4f31d2
parent 1f2b34d415e020ab88bc152a8d93116482da8d6a

Merge "Require correct permission in carrier config loader." into mnc-dev

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index b1621cf..d5db212 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -586,6 +586,7 @@
     @Override public
     @NonNull
     PersistableBundle getConfigForSubId(int subId) {
+        mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
         int phoneId = SubscriptionManager.getPhoneId(subId);
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
         if (SubscriptionManager.isValidPhoneId(phoneId)) {
@@ -625,6 +626,8 @@
 
     @Override
     public void updateConfigForPhoneId(int phoneId, String simState) {
+        mContext.enforceCallingOrSelfPermission(
+                android.Manifest.permission.MODIFY_PHONE_STATE, null);
         log("update config for phoneId: " + phoneId + " simState: " + simState);
         if (!SubscriptionManager.isValidPhoneId(phoneId)) {
             return;