diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2016-03-24 20:36:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-24 20:36:30 +0000 |
| commit | aede8199b1775189054283dbf3ee6b6e3d9af80f (patch) | |
| tree | aa5a796bf0432cbd55a701f7b1c364e2ef487896 | |
| parent | 1481b17edfca0644522c6315d36e4a52261ecf17 (diff) | |
| parent | 49b12720e68890a3699e5c2deca5434c2bd583a6 (diff) | |
| download | Stk-aede8199b1775189054283dbf3ee6b6e3d9af80f.tar.gz | |
Merge "Specify appropriate slot ID for the secondary slot" into nyc-dev
| -rwxr-xr-x[-rw-r--r--] | src/com/android/stk/StkAppService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 6f58238..8019a0c 100644..100755 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -691,9 +691,9 @@ public class StkAppService extends Service implements Runnable { 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); @@ -1591,7 +1591,7 @@ public class StkAppService extends Service implements Runnable { 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"); @@ -1616,6 +1616,7 @@ public class StkAppService extends Service implements Runnable { args.putInt(CHOICE, YES); Message message = mServiceHandler.obtainMessage(); message.arg1 = OP_RESPONSE; + message.arg2 = slotId; message.obj = args; mServiceHandler.sendMessage(message); } @@ -1628,6 +1629,7 @@ public class StkAppService extends Service implements Runnable { args.putInt(CHOICE, NO); Message message = mServiceHandler.obtainMessage(); message.arg1 = OP_RESPONSE; + message.arg2 = slotId; message.obj = args; mServiceHandler.sendMessage(message); } |