commit fdbac2c7015e31614b8a059f455cef1323712f84
author Wink Saville <wink@google.com> Mon Sep 09 11:09:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 09 11:09:17 2013 -0700
tree ef9cd2fdd0f2d64cacd16d2bac396679d26c899a
parent 2d613a114407dd0e88f59ca00eac60888c1e7569
parent d3b05ac632af209b395cc702d26815c1c54d2119

am d3b05ac6: Merge "Stk: Open Channel Fixes"

* commit 'd3b05ac632af209b395cc702d26815c1c54d2119':
  Stk: Open Channel Fixes

src/com/android/stk/StkAppService.java

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 @@
                     break;
                 }
             }
-            launchTransientEventMessage();
+            /*
+             * Display indication in the form of a toast to the user if required.
+             */
+            launchEventMessage();
             break;
         }
 
@@ -499,6 +502,7 @@
 
         // 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 @@
             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 @@
             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;