diff options
| author | Wink Saville <wink@google.com> | 2013-09-09 18:02:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-09-09 18:02:37 +0000 |
| commit | d3b05ac632af209b395cc702d26815c1c54d2119 (patch) | |
| tree | 8e30e3d284a8b6b45e6dfab575158d64176a6fa6 | |
| parent | a1769a3d781bbad02cf3bc17d3069f72533b15f2 (diff) | |
| parent | 46470e7d7b36d6510c864cb2b32a78a0b09ce8f7 (diff) | |
| download | Stk-tools_r22.2.tar.gz | |
Merge "Stk: Open Channel Fixes"tools_r22.2
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index 41084f0..9ed4555 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -469,7 +469,10 @@ public class StkAppService extends Service implements Runnable { break; } } - launchTransientEventMessage(); + /* + * Display indication in the form of a toast to the user if required. + */ + launchEventMessage(); break; } @@ -499,6 +502,7 @@ public class StkAppService extends Service implements Runnable { // set result code boolean helpRequired = args.getBoolean(HELP, false); + boolean confirmed = false; switch(args.getInt(RES_ID)) { case RES_ID_MENU_SELECTION: @@ -536,7 +540,7 @@ public class StkAppService extends Service implements Runnable { break; case RES_ID_CONFIRM: CatLog.d(this, "RES_ID_CONFIRM"); - boolean confirmed = args.getBoolean(CONFIRMATION); + confirmed = args.getBoolean(CONFIRMATION); switch (mCurrentCmd.getCmdType()) { case DISPLAY_TEXT: resMsg.setResultCode(confirmed ? ResultCode.OK @@ -590,12 +594,19 @@ public class StkAppService extends Service implements Runnable { switch (choice) { case YES: resMsg.setResultCode(ResultCode.OK); + confirmed = true; break; case NO: resMsg.setResultCode(ResultCode.USER_NOT_ACCEPT); break; } + + if (mCurrentCmd.getCmdType().value() == AppInterface.CommandType.OPEN_CHANNEL + .value()) { + resMsg.setConfirmation(confirmed); + } break; + default: CatLog.d(this, "Unknown result id"); return; |