Merge change 744 into donut
* changes:
Add RIL_UNSOL_OEM_HOOK_RAW
diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 538093e..2ddb2bb 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -3137,6 +3137,15 @@
*/
#define RIL_UNSOL_CDMA_INFO_REC 1027
+/**
+ * RIL_UNSOL_OEM_HOOK_RAW
+ *
+ * This is for OEM specific use.
+ *
+ * "data" is a byte[]
+ */
+#define RIL_UNSOL_OEM_HOOK_RAW 1028
+
/***********************************************************************/
diff --git a/libril/ril.cpp b/libril/ril.cpp
index b5749c3..54ee61f 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2757,6 +2757,7 @@
case RIL_UNSOL_RESPONSE_CDMA_NEW_SMS: return "UNSOL_NEW_CDMA_SMS";
case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS: return "UNSOL_NEW_BROADCAST_SMS";
case RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL: return "UNSOL_CDMA_RUIM_SMS_STORAGE_FULL";
+ case RIL_UNSOL_OEM_HOOK_RAW: return "UNSOL_OEM_HOOK_RAW";
default: return "<unknown request>";
}
}
diff --git a/libril/ril_unsol_commands.h b/libril/ril_unsol_commands.h
index c01e40f..d11f909 100644
--- a/libril/ril_unsol_commands.h
+++ b/libril/ril_unsol_commands.h
@@ -37,4 +37,10 @@
{RIL_UNSOL_RESPONSE_CDMA_NEW_SMS, responseCdmaSms, WAKE_PARTIAL},
{RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS, responseString, WAKE_PARTIAL},
{RIL_UNSOL_CDMA_RUIM_SMS_STORAGE_FULL, responseVoid, WAKE_PARTIAL},
- {RIL_UNSOL_RESTRICTED_STATE_CHANGED, responseInts, WAKE_PARTIAL}
+ {RIL_UNSOL_RESTRICTED_STATE_CHANGED, responseInts, WAKE_PARTIAL},
+ // TODO(): The following 4 CDMA commands need to be implemented
+ {RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE, responseVoid, WAKE_PARTIAL},
+ {RIL_UNSOL_CDMA_CALL_WAITING, responseVoid, WAKE_PARTIAL},
+ {RIL_UNSOL_CDMA_OTA_PROVISION_STATUS, responseInts, WAKE_PARTIAL},
+ {RIL_UNSOL_CDMA_INFO_REC, responseVoid, WAKE_PARTIAL},
+ {RIL_UNSOL_OEM_HOOK_RAW, responseRaw, WAKE_PARTIAL}