commit 7298f4f827bddf5c22b0ee02b998c4b3e7146c25
author Pankaj Kanwar <pkanwar@google.com> Tue Apr 25 16:08:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 25 16:08:26 2017 +0000
tree 6de4b2557214397140444ae30fc1f31be6bf05f3
parent ef25afe8f4a0705fa861e5e87fe51becfe4e9139
parent f852078b1407d7bc3c56dde557017bab03090294

Merge "Provide an API to make USSD calls and read the responses."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9d16bad..8670ae2 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1544,9 +1544,8 @@
         return handlePinMmiForSubscriber(getDefaultSubscription(), dialString);
     }
 
-    public void handleUssdRequest(String ussdRequest, ResultReceiver wrappedCallback) {
+    public void handleUssdRequest(int subId, String ussdRequest, ResultReceiver wrappedCallback) {
       enforceCallPermission();
-      int subId = getDefaultSubscription();
       if (!SubscriptionManager.isValidSubscriptionId(subId)) {
           return;
       }
@@ -1554,7 +1553,6 @@
       sendRequest(CMD_HANDLE_USSD_REQUEST, ussdObject, subId);
     };
 
-
     public boolean handlePinMmiForSubscriber(int subId, String dialString) {
         enforceModifyPermission();
         if (!SubscriptionManager.isValidSubscriptionId(subId)) {