commit 48004a749153f1477e5d1e6a815bac2341c274a8
author Shuo Qian <shuoq@google.com> Wed Aug 16 00:36:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 16 00:36:08 2017 +0000
tree c878e9c0a15411ccb147047a9e49eb77fbbc770e
parent 04b63e5ab23092cb8cbbfc482ef0ece8e457cb2a
parent 5e3275d44e5956526676c7eba49f3b2216d1e3ef

Merge "Change mapping of QMI error"
am: 5e3275d44e

Change-Id: I44f62dc958d548ce5d77a81ee31e919db060539d

include/telephony/ril.h

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index bc21790..540ad48 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -2462,7 +2462,7 @@
  *  NO_NETWORK_FOUND
  *  INVALID_CALL_ID
  *  DEVICE_IN_USE
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  ABORTED
  *  CANCELLED
  *  REQUEST_NOT_SUPPORTED
@@ -2922,6 +2922,7 @@
  *  INVALID_SMSC_ADDRESS
  *  MODEM_ERR
  *  NETWORK_ERR
+ *  OPERATION_NOT_ALLOWED
  *  NO_MEMORY
  *  NO_RESOURCES
  *  CANCELLED
@@ -2969,6 +2970,7 @@
  *  NETWORK_ERR
  *  ENCODING_ERR
  *  INVALID_SMSC_ADDRESS
+ *  OPERATION_NOT_ALLOWED
  *  INTERNAL_ERR
  *  NO_RESOURCES
  *  CANCELLED
@@ -4144,7 +4146,7 @@
  *  NO_MEMORY
  *  NO_RESOURCES
  *  INVALID_MODEM_STATE
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  INVALID_SMSC_ADDRESS
  *  CANCELLED
  *  INVALID_MODEM_STATE
@@ -4737,7 +4739,7 @@
  *  INVALID_CALL_ID
  *  NO_RESOURCES
  *  CANCELLED
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  REQUEST_NOT_SUPPORTED
  *
  */
@@ -4804,6 +4806,7 @@
  *  NETWORK_ERR
  *  ENCODING_ERR
  *  INVALID_SMSC_ADDRESS
+ *  OPERATION_NOT_ALLOWED
  *  NO_RESOURCES
  *  CANCELLED
  *  REQUEST_NOT_SUPPORTED
@@ -4834,7 +4837,7 @@
  *  SYSTEM_ERR
  *  MODEM_ERR
  *  INVALID_STATE
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  NETWORK_NOT_READY
  *  INVALID_MODEM_STATE
  *  REQUEST_NOT_SUPPORTED
@@ -5078,7 +5081,7 @@
  *  NO_MEMORY
  *  NO_RESOURCES
  *  INVALID_MODEM_STATE
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  INVALID_SMSC_ADDRESS
  *  CANCELLED
  *  INVALID_MODEM_STATE
@@ -5560,7 +5563,7 @@
  *  NETWORK_ERR
  *  ENCODING_ERR
  *  INVALID_SMSC_ADDRESS
- *  MODE_NOT_SUPPORTED
+ *  OPERATION_NOT_ALLOWED
  *  INTERNAL_ERR
  *  NO_RESOURCES
  *  CANCELLED