commit 352d8cdf7ed125668d865f61172abfc31835c5a9
author Derek Tan <derektan@google.com> Sat Jul 12 12:57:11 2014 -0700
committer Derek Tan <derektan@google.com> Mon Jul 14 16:16:30 2014 +0000
tree 8cdc672b1fa5a2ba2bf932f156c1ac70f5962658
parent 7226c84acb402f96e527650347391fa025294350

Add carrier privilege to enableSimplifiedNetworkSettings and setLine1NumberForDisplay.

Change-Id: I9e90924d92bc8394e600df9f319414a889ec97c0
(cherry picked from commit b4463ec0c5eacb9af510c905697041ed295754b1)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8e03568..2590aa4 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1724,7 +1724,7 @@
 
     @Override
     public void enableSimplifiedNetworkSettings(long subId, boolean enable) {
-        enforceModifyPermission();
+        enforceModifyPermissionOrCarrierPrivilege();
         if (enable) {
             mSimplifiedNetworkSettings.add(subId);
         } else {
@@ -1740,7 +1740,7 @@
 
     @Override
     public void setLine1NumberForDisplay(long subId, String alphaTag, String number) {
-        enforceModifyPermission();
+        enforceModifyPermissionOrCarrierPrivilege();
         mAdnRecordsForDisplay.put(subId, new AdnRecord(alphaTag, number));
     }