commit 0815970067d8c8c34b30a6ec0acd44396f2f95ac
author Wink Saville <wink@google.com> Mon Dec 17 16:46:15 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 17 16:46:16 2012 -0800
tree 95505b5efef016105cc3d0679edff93bf8c877eb
parent 8becf90afdeccbb7c65080f778bac56d262a3bf9
parent 86968438e444728053137c764cc37cf9c0a15d16

Merge "CatService: Add support for GET_CHANNEL_STATUS p-cmd."

src/java/com/android/internal/telephony/cat/AppInterface.java

diff --git a/src/java/com/android/internal/telephony/cat/AppInterface.java b/src/java/com/android/internal/telephony/cat/AppInterface.java
index 299e140..01b86ef 100644
--- a/src/java/com/android/internal/telephony/cat/AppInterface.java
+++ b/src/java/com/android/internal/telephony/cat/AppInterface.java
@@ -64,7 +64,8 @@
         OPEN_CHANNEL(0x40),
         CLOSE_CHANNEL(0x41),
         RECEIVE_DATA(0x42),
-        SEND_DATA(0x43);
+        SEND_DATA(0x43),
+        GET_CHANNEL_STATUS(0x44);
 
         private int mValue;
 

src/java/com/android/internal/telephony/cat/CatCmdMessage.java

diff --git a/src/java/com/android/internal/telephony/cat/CatCmdMessage.java b/src/java/com/android/internal/telephony/cat/CatCmdMessage.java
index 48c2e2b..9284d03 100644
--- a/src/java/com/android/internal/telephony/cat/CatCmdMessage.java
+++ b/src/java/com/android/internal/telephony/cat/CatCmdMessage.java
@@ -80,6 +80,9 @@
             mToneSettings = params.settings;
             mTextMsg = params.textMsg;
             break;
+        case GET_CHANNEL_STATUS:
+            mTextMsg = ((CallSetupParams) cmdParams).confirmMsg;
+            break;
         case SET_UP_CALL:
             mCallSettings = new CallSettings();
             mCallSettings.confirmMsg = ((CallSetupParams) cmdParams).confirmMsg;

src/java/com/android/internal/telephony/cat/CommandParamsFactory.java

diff --git a/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java b/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
index bd06a75..ed30279 100644
--- a/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
+++ b/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
@@ -150,6 +150,7 @@
              case SEND_USSD:
                  cmdPending = processEventNotify(cmdDet, ctlvs);
                  break;
+             case GET_CHANNEL_STATUS:
              case SET_UP_CALL:
                  cmdPending = processSetupCall(cmdDet, ctlvs);
                  break;