STK: CC feature implementation

Handle ALPHA_NOTIFY and display a toast mesage to user.

Conflicts:
	AndroidManifest.xml

Change-Id: I4f02237960003e9c6ebb477ea756923fd2598d0d

3 files changed, 26 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0d58ad8..5c86ad2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,6 +82,7 @@
                 <action android:name= "android.intent.action.stk.command" />
                 <action android:name= "android.intent.action.stk.session_end" />
                 <action android:name= "android.intent.action.stk.icc_status_change" />
+                <action android:name= "org.codeaurora.intent.action.stk.alpha_notify" />
             </intent-filter>
         </receiver>
 
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 7e497f9..a80f5bf 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -108,6 +108,7 @@ public class StkAppService extends Service implements Runnable {
     static final int OP_BOOT_COMPLETED = 5;
     private static final int OP_DELAYED_MSG = 6;
     static final int OP_CARD_STATUS_CHANGED = 7;
+    static final int OP_ALPHA_NOTIFY = 10;
 
     // Response ids
     static final int RES_ID_MENU_SELECTION = 11;
@@ -192,6 +193,7 @@ public class StkAppService extends Service implements Runnable {
             break;
         case OP_RESPONSE:
         case OP_CARD_STATUS_CHANGED:
+        case OP_ALPHA_NOTIFY:
             msg.obj = args;
             /* falls through */
         case OP_LAUNCH_APP:
@@ -354,6 +356,9 @@ public class StkAppService extends Service implements Runnable {
                 CatLog.d(this, "Card/Icc Status change received");
                 handleCardStatusChangeAndIccRefresh((Bundle) msg.obj);
                 break;
+            case OP_ALPHA_NOTIFY:
+                handleAlphaNotify((Bundle) msg.obj);
+                break;
             }
         }
 
@@ -1016,4 +1021,13 @@ public class StkAppService extends Service implements Runnable {
         }
         return false;
     }
+
+    private void handleAlphaNotify(Bundle args) {
+        String alphaString = args.getString(AppInterface.ALPHA_STRING);
+
+        CatLog.d(this, "Alpha string received from card: " + alphaString);
+        Toast toast = Toast.makeText(sInstance, alphaString, Toast.LENGTH_LONG);
+        toast.setGravity(Gravity.TOP, 0, 0);
+        toast.show();
+    }
 }
diff --git a/src/com/android/stk/StkCmdReceiver.java b/src/com/android/stk/StkCmdReceiver.java
index 8e9aae7..b91f489 100644
--- a/src/com/android/stk/StkCmdReceiver.java
+++ b/src/com/android/stk/StkCmdReceiver.java
@@ -40,6 +40,8 @@ public class StkCmdReceiver extends BroadcastReceiver {
             handleSessionEnd(context, intent);
         } else if (action.equals(AppInterface.CAT_ICC_STATUS_CHANGE)) {
             handleCardStatusChange(context, intent);
+        } else if (action.equals(AppInterface.CAT_ALPHA_NOTIFY_ACTION)) {
+            handleAlphaNotify(context, intent);
         }
     }
 
@@ -76,4 +78,13 @@ public class StkCmdReceiver extends BroadcastReceiver {
         context.startService(new Intent(context, StkAppService.class)
                 .putExtras(args));
     }
+
+    private void handleAlphaNotify(Context context, Intent intent) {
+        Bundle args = new Bundle();
+        String alphaString = intent.getStringExtra(AppInterface.ALPHA_STRING);
+        args.putInt(StkAppService.OPCODE, StkAppService.OP_ALPHA_NOTIFY);
+        args.putString(AppInterface.ALPHA_STRING, alphaString);
+        context.startService(new Intent(context, StkAppService.class)
+                .putExtras(args));
+    }
 }