diff options
| author | Wink Saville <wink@google.com> | 2013-09-11 04:49:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-11 04:49:11 +0000 |
| commit | 4c910a1ff390f7717710a142bc5b53fd3919f9a4 (patch) | |
| tree | 892f23b4391d546667d9af02d49965d979f05c7d /src/com/android | |
| parent | dd7f2bedaf123f306929e7a0b15835ee84e20bc1 (diff) | |
| parent | cacf7b8944cb0eb03cdb38b00aba7ffaac6971d5 (diff) | |
| download | Stk-4c910a1ff390f7717710a142bc5b53fd3919f9a4.tar.gz | |
Merge "Stk: Open Channel Fixes" into klp-devandroid-4.4_r0.7
Diffstat (limited to 'src/com/android')
| -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 c0ba74c..42e8e01 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -470,7 +470,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; } @@ -500,6 +503,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: @@ -537,7 +541,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 @@ -591,12 +595,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; |