commit 4ffff831de7ae9ff960da92970a0073d6e369a0d
author Nancy Chen <nancychen@google.com> Fri Oct 31 22:06:35 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 31 22:06:36 2014 +0000
tree 1f89fb801540e3066c82bad8a47f440dc8c9ea28
parent 6e2b94eae72c72b11358fdb99f87471b5ab11e4f
parent 3ab204c11eb56bbf1fa5a0b4343b2382614bb46e

Merge "Handle MMI for multi-SIM (2/3)" into lmp-mr1-dev

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 95a7e75..52f258f 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -462,6 +462,27 @@
     }
 
     /**
+     * @see android.telecom.TelecomManager#handleMmi
+     */
+    @Override
+    public boolean handlePinMmiForPhoneAccount(PhoneAccountHandle accountHandle,
+            String dialString) {
+        enforceModifyPermissionOrDefaultDialer();
+
+        // Switch identity so that TelephonyManager checks Telecom's permissions instead.
+        long token = Binder.clearCallingIdentity();
+        boolean retval = false;
+        try {
+            int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);
+            retval = getTelephonyManager().handlePinMmiForSubscriber(subId, dialString);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+
+        return retval;
+    }
+
+    /**
      * @see android.telecom.TelecomManager#isTtySupported
      */
     @Override