commit 2fde70f394d51c824f019e1c34c9b7c07f72f5e9
author Nazanin Bakhshi <nazaninb@google.com> Wed Mar 06 19:10:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 06 19:10:58 2019 +0000
tree 52c61b26e8e4bdea75db8aba02929bda85849b76
parent 2de4c0e40ed66c2bf94ea2f47ac7427c7824de95
parent 814dc224af4fb4990f6fdffc3f3aaad692d4fb6c

Merge "disallow changing from multi-sim to single-sim for carrier apps"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8bc8ce0..fd484f0 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6616,12 +6616,19 @@
 
     /**
      * Switch configs to enable multi-sim or switch back to single-sim
+     * Note: Switch from multi-sim to single-sim is only possible with MODIFY_PHONE_STATE
+     * permission, but the other way around is possible with either MODIFY_PHONE_STATE
+     * or carrier privileges
      * @param numOfSims number of active sims we want to switch to
      */
     @Override
     public void switchMultiSimConfig(int numOfSims) {
-        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
-                mApp, SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, "switchMultiSimConfig");
+        if (numOfSims == 1) {
+            enforceModifyPermission();
+        } else {
+            TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                    mApp, SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, "switchMultiSimConfig");
+        }
         final long identity = Binder.clearCallingIdentity();
 
         try {