diff options
author | Sandeep Gutta <sangutta@codeaurora.org> | 2015-03-13 21:37:11 +0530 |
---|---|---|
committer | Akhila Musunuri <makhila@codeaurora.org> | 2015-03-17 19:46:40 +0530 |
commit | eb9517a1f3ff13c5e87047f15d7f8f9ef9563075 (patch) | |
tree | 1ccf8e2886e49cc50849fb80c60c23ed9411c881 /libril/ril_unsol_commands.h | |
parent | 36c6d70ec09da6d54979cb2ea232c2b5a8e9abeb (diff) | |
parent | 2210a0276fa000ef7224f26b24f00cb34a372e8d (diff) | |
download | android_hardware_ril-eb9517a1f3ff13c5e87047f15d7f8f9ef9563075.tar.gz android_hardware_ril-eb9517a1f3ff13c5e87047f15d7f8f9ef9563075.tar.bz2 android_hardware_ril-eb9517a1f3ff13c5e87047f15d7f8f9ef9563075.zip |
Merge tag 'android-5.1.0_r1' into HEAD.
Android 5.1.0 release 1
Conflicts:
include/telephony/ril.h
libril/ril.cpp
libril/ril_commands.h
libril/ril_unsol_commands.h
reference-ril/reference-ril.c
Change-Id: Ie08131e365a002c461c2339c8e31c76001b3cc3d
Diffstat (limited to 'libril/ril_unsol_commands.h')
-rwxr-xr-x | libril/ril_unsol_commands.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libril/ril_unsol_commands.h b/libril/ril_unsol_commands.h index d1f6a8f..6ea7157 100755 --- a/libril/ril_unsol_commands.h +++ b/libril/ril_unsol_commands.h @@ -56,5 +56,6 @@ {RIL_UNSOL_SRVCC_STATE_NOTIFY, responseInts, WAKE_PARTIAL}, {RIL_UNSOL_HARDWARE_CONFIG_CHANGED, responseHardwareConfig, WAKE_PARTIAL}, {RIL_UNSOL_DC_RT_INFO_CHANGED, responseDcRtInfo, WAKE_PARTIAL}, + {RIL_UNSOL_RADIO_CAPABILITY, responseRadioCapability, WAKE_PARTIAL}, {RIL_UNSOL_ON_SS, responseSSData, WAKE_PARTIAL}, {RIL_UNSOL_STK_CC_ALPHA_NOTIFY, responseString, WAKE_PARTIAL}, |