commit 09a68ba315ca3d6b092fd8078cc42b93b7934a1a
author jsh <jsh@google.com> Wed Jun 10 11:56:38 2009 -0700
committer jsh <jsh@google.com> Fri Jun 19 17:34:46 2009 -0700
tree 74a62bac33811c01b4f9d6ea40c559bb3e5854de
parent d6aa2e32a44f883b008b9bb12b322f5b7e8dced4

Add remaining retry count to response for PIN/PUK commands.

RIL_REQUEST_ENTER_SIM_PIN
RIL_REQUEST_ENTER_SIM_PUK
RIL_REQUEST_ENTER_SIM_PIN2
RIL_REQUEST_ENTER_SIM_PUK2
RIL_REQUEST_CHANGE_SIM_PIN
RIL_REQUEST_CHANGE_SIM_PIN2
RIL_REQUEST_SET_FACILITY_LOCK
RIL_ENTER_NETWORK_DEPERSONALIZATION

Also add requestToString entry for REPORT_SMS_MEMORY_STATUS.

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index dc69b14..e3bf53f 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2996,6 +2996,7 @@
         case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: return "EXIT_EMERGENCY_CALLBACK_MODE";
         case RIL_REQUEST_GET_SMSC_ADDRESS: return "GET_SMSC_ADDRESS";
         case RIL_REQUEST_SET_SMSC_ADDRESS: return "SET_SMSC_ADDRESS";
+        case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: return "REPORT_SMS_MEMORY_STATUS";
         case RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED: return "UNSOL_RESPONSE_RADIO_STATE_CHANGED";
         case RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED: return "UNSOL_RESPONSE_CALL_STATE_CHANGED";
         case RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED: return "UNSOL_RESPONSE_NETWORK_STATE_CHANGED";

libril/ril_commands.h

diff --git a/libril/ril_commands.h b/libril/ril_commands.h
index 1786c8d..ab60ef0 100644
--- a/libril/ril_commands.h
+++ b/libril/ril_commands.h
@@ -16,13 +16,13 @@
 */
     {0, NULL, NULL},                   //none
     {RIL_REQUEST_GET_SIM_STATUS, dispatchVoid, responseSimStatus},
-    {RIL_REQUEST_ENTER_SIM_PIN, dispatchStrings, responseVoid},
-    {RIL_REQUEST_ENTER_SIM_PUK, dispatchStrings, responseVoid},
-    {RIL_REQUEST_ENTER_SIM_PIN2, dispatchStrings, responseVoid},
-    {RIL_REQUEST_ENTER_SIM_PUK2, dispatchStrings, responseVoid},
-    {RIL_REQUEST_CHANGE_SIM_PIN, dispatchStrings, responseVoid},
-    {RIL_REQUEST_CHANGE_SIM_PIN2, dispatchStrings, responseVoid},
-    {RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, dispatchStrings, responseVoid},
+    {RIL_REQUEST_ENTER_SIM_PIN, dispatchStrings, responseInts},
+    {RIL_REQUEST_ENTER_SIM_PUK, dispatchStrings, responseInts},
+    {RIL_REQUEST_ENTER_SIM_PIN2, dispatchStrings, responseInts},
+    {RIL_REQUEST_ENTER_SIM_PUK2, dispatchStrings, responseInts},
+    {RIL_REQUEST_CHANGE_SIM_PIN, dispatchStrings, responseInts},
+    {RIL_REQUEST_CHANGE_SIM_PIN2, dispatchStrings, responseInts},
+    {RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION, dispatchStrings, responseInts},
     {RIL_REQUEST_GET_CURRENT_CALLS, dispatchVoid, responseCallList},
     {RIL_REQUEST_DIAL, dispatchDial, responseVoid},
     {RIL_REQUEST_GET_IMSI, dispatchVoid, responseString},
@@ -57,7 +57,7 @@
     {RIL_REQUEST_ANSWER,dispatchVoid, responseVoid},
     {RIL_REQUEST_DEACTIVATE_DATA_CALL, dispatchStrings, responseVoid},
     {RIL_REQUEST_QUERY_FACILITY_LOCK, dispatchStrings, responseInts},
-    {RIL_REQUEST_SET_FACILITY_LOCK, dispatchStrings, responseVoid},
+    {RIL_REQUEST_SET_FACILITY_LOCK, dispatchStrings, responseInts},
     {RIL_REQUEST_CHANGE_BARRING_PASSWORD, dispatchStrings, responseVoid},
     {RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE, dispatchVoid, responseInts},
     {RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, dispatchVoid, responseVoid},