commit f0730259c79aab4eedd8a575b4491cb37c8e8c03
author Sanket Padawe <sanketpadawe@google.com> Thu Aug 10 05:23:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 10 05:23:29 2017 +0000
tree f22eb858866592d1ba43523b471b354efba4e168
parent 0f8ddaeda65bf76edee3d60c5599b686c744916b
parent 8d7989c455cd8fc218151bc12b3a2076b5e4bbfc

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am: f0cbbbcdac am: ab379831bc am: a5eeaef8ee am: 6c6d404fb5 am: 96582369cb  -s ours am: 7421b551d3 am: b6daf50700 am: c4a73f3899
am: 8d7989c455  -s ours

Change-Id: I62003e6d0d70750f55da53a969ea6c1e0ee63fb1

include/telephony/ril.h

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 4e6aa6c..993ee0c 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -2400,8 +2400,8 @@
  *  SUCCESS
  *  RADIO_NOT_AVAILABLE (radio resetting)
  *  PASSWORD_INCORRECT
- *     (code is invalid)
  *  SIM_ABSENT
+ *     (code is invalid)
  *  INTERNAL_ERR
  *  NO_MEMORY
  *  NO_RESOURCES
@@ -3054,7 +3054,7 @@
  *    RADIO_NOT_AVAILABLE, OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
  *    OP_NOT_ALLOWED_DURING_VOICE_CALL, REQUEST_NOT_SUPPORTED,
  *    INVALID_ARGUMENTS, INTERNAL_ERR, NO_MEMORY, NO_RESOURCES,
- *    SIM_ABSENT and CANCELLED
+ *    CANCELLED and SIM_ABSENT
  *
  * See also: RIL_REQUEST_DEACTIVATE_DATA_CALL
  */