Merge "PhoneInterfaceManager should use subId value in requests." into lmp-mr1-dev
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3fd5e65..268cf25 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -215,7 +215,8 @@
switch (msg.what) {
case CMD_HANDLE_PIN_MMI:
request = (MainThreadRequest) msg.obj;
- request.result = mPhone.handlePinMmi((String) request.argument);
+ request.result = getPhoneFromRequest(request).handlePinMmi(
+ (String) request.argument);
// Wake up the requesting thread
synchronized (request) {
request.notifyAll();
@@ -246,13 +247,13 @@
case CMD_ANSWER_RINGING_CALL:
request = (MainThreadRequest) msg.obj;
- int answer_subId = ((Integer)request.argument).intValue();
+ int answer_subId = request.subId;
answerRingingCallInternal(answer_subId);
break;
case CMD_END_CALL:
request = (MainThreadRequest) msg.obj;
- int end_subId = ((Integer)request.argument).intValue();
+ int end_subId = request.subId;
final boolean hungUp;
int phoneType = getPhone(end_subId).getPhoneType();
if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
@@ -606,8 +607,8 @@
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_SET_VOICEMAIL_NUMBER_DONE, request);
Pair<String, String> tagNum = (Pair<String, String>) request.argument;
- Phone phone = (request.subId == null) ? mPhone : getPhone(request.subId);
- phone.setVoiceMailNumber(tagNum.first, tagNum.second, onCompleted);
+ getPhoneFromRequest(request).setVoiceMailNumber(tagNum.first, tagNum.second,
+ onCompleted);
break;
case EVENT_SET_VOICEMAIL_NUMBER_DONE:
@@ -730,6 +731,10 @@
ServiceManager.addService("phone", this);
}
+ private Phone getPhoneFromRequest(MainThreadRequest request) {
+ return (request.subId == null) ? mPhone : getPhone(request.subId);
+ }
+
// returns phone associated with the subId.
private Phone getPhone(int subId) {
return PhoneFactory.getPhone(mSubscriptionController.getPhoneId(subId));
@@ -818,7 +823,7 @@
*/
public boolean endCallForSubscriber(int subId) {
enforceCallPermission();
- return (Boolean) sendRequest(CMD_END_CALL, new Integer(subId), null);
+ return (Boolean) sendRequest(CMD_END_CALL, null, new Integer(subId));
}
public void answerRingingCall() {
@@ -831,7 +836,7 @@
// but that can probably wait till the big TelephonyManager API overhaul.
// For now, protect this call with the MODIFY_PHONE_STATE permission.
enforceModifyPermission();
- sendRequest(CMD_ANSWER_RINGING_CALL, new Integer(subId), null);
+ sendRequest(CMD_ANSWER_RINGING_CALL, null, new Integer(subId));
}
/**