am 2a7411dc: am 5909cf83: Add RIL_UNSOL_RESEND_INCALL_MUTE.

Merge commit '2a7411dc92f15111e36f72214216f96aab2c51f9'

* commit '2a7411dc92f15111e36f72214216f96aab2c51f9':
  Add RIL_UNSOL_RESEND_INCALL_MUTE.

3 files changed, 14 insertions, 1 deletions

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index e787a2a..185f3c0 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -3349,6 +3349,17 @@ typedef struct {
  */
 #define RIL_UNSOL_RINGBACK_TONE 1029
 
+/**
+ * RIL_UNSOL_RESEND_INCALL_MUTE
+ *
+ * Indicates that framework/application need reset the uplink mute state.
+ *
+ * There may be situations where the mute state becomes out of sync
+ * between the application and device in some GSM infrastructures.
+ *
+ * "data" is null
+ */
+#define RIL_UNSOL_RESEND_INCALL_MUTE 1030
 /***********************************************************************/
 
 
diff --git a/libril/ril.cpp b/libril/ril.cpp
index 9c5c4ec..eea2a70 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -3088,6 +3088,7 @@ requestToString(int request) {
         case RIL_UNSOL_CDMA_INFO_REC: return "UNSOL_CDMA_INFO_REC";
         case RIL_UNSOL_OEM_HOOK_RAW: return "UNSOL_OEM_HOOK_RAW";
         case RIL_UNSOL_RINGBACK_TONE: return "UNSOL_RINGBACK_TONE";
+        case RIL_UNSOL_RESEND_INCALL_MUTE: return "UNSOL_RESEND_INCALL_MUTE";
         default: return "<unknown request>";
     }
 }
diff --git a/libril/ril_unsol_commands.h b/libril/ril_unsol_commands.h
index 2dc31e6..3660702 100644
--- a/libril/ril_unsol_commands.h
+++ b/libril/ril_unsol_commands.h
@@ -43,4 +43,5 @@
     {RIL_UNSOL_CDMA_OTA_PROVISION_STATUS, responseInts, WAKE_PARTIAL},
     {RIL_UNSOL_CDMA_INFO_REC, responseCdmaInformationRecords, WAKE_PARTIAL},
     {RIL_UNSOL_OEM_HOOK_RAW, responseRaw, WAKE_PARTIAL},
-    {RIL_UNSOL_RINGBACK_TONE, responseInts, WAKE_PARTIAL}
+    {RIL_UNSOL_RINGBACK_TONE, responseInts, WAKE_PARTIAL},
+    {RIL_UNSOL_RESEND_INCALL_MUTE, responseVoid, WAKE_PARTIAL}