Specify appropriate slot ID for the secondary slot
The service handler expects that 'msg.arg2' contains the appropriate
slot ID. The terminal always sends response only to the SIM card
inserted to the first slot if slot ID is not specified.
Bug: 27267663
Change-Id: I7df65f929ccd5c66bc4b62f87ae3049547589e01
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
old mode 100644
new mode 100755
index 0b19f9e..8512c1b
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -689,9 +689,9 @@
private void sendResponse(int resId, int slotId, boolean confirm) {
Message msg = mServiceHandler.obtainMessage();
msg.arg1 = OP_RESPONSE;
+ msg.arg2 = slotId;
Bundle args = new Bundle();
args.putInt(StkAppService.RES_ID, resId);
- args.putInt(SLOT_ID, slotId);
args.putBoolean(StkAppService.CONFIRMATION, confirm);
msg.obj = args;
mServiceHandler.sendMessage(msg);
@@ -1589,7 +1589,7 @@
startActivity(newIntent);
}
- private void launchOpenChannelDialog(int slotId) {
+ private void launchOpenChannelDialog(final int slotId) {
TextMessage msg = mStkContext[slotId].mCurrentCmd.geTextMessage();
if (msg == null) {
CatLog.d(LOG_TAG, "msg is null, return here");
@@ -1614,6 +1614,7 @@
args.putInt(CHOICE, YES);
Message message = mServiceHandler.obtainMessage();
message.arg1 = OP_RESPONSE;
+ message.arg2 = slotId;
message.obj = args;
mServiceHandler.sendMessage(message);
}
@@ -1626,6 +1627,7 @@
args.putInt(CHOICE, NO);
Message message = mServiceHandler.obtainMessage();
message.arg1 = OP_RESPONSE;
+ message.arg2 = slotId;
message.obj = args;
mServiceHandler.sendMessage(message);
}