commit 1f2b34d415e020ab88bc152a8d93116482da8d6a
author Junda Liu <junda@google.com> Thu Jun 18 15:26:56 2015 -0700
committer Junda Liu <junda@google.com> Thu Jun 18 15:26:56 2015 -0700
tree 06f95eccf88e77f180c1c9344a5eeedad88c6bdf
parent c9551e6840b704f327b3780c67b60de19c4010d1

Require correct permission in carrier config loader.

Bug: b/20826627
Change-Id: Ia1dfe0c5dde10387501ab05afba4d80a0e9a446c

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 544b7b2..f1706be 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -572,6 +572,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)) {
@@ -611,6 +612,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;