diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-18 00:41:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 00:41:06 +0000 |
| commit | 48a5576acc90b2c2c4dc446467c8a7dc9ca80fe8 (patch) | |
| tree | 720b2d0eebd6d995b252c37f26ebb2668d345f16 | |
| parent | 1a61ffd58d9f799896fe71b59623b9da1fb30356 (diff) | |
| parent | f34ed01f1e1935c67e153916ea27dddae4d067dc (diff) | |
| download | android_hardware_ril-48a5576acc90b2c2c4dc446467c8a7dc9ca80fe8.tar.gz android_hardware_ril-48a5576acc90b2c2c4dc446467c8a7dc9ca80fe8.tar.bz2 android_hardware_ril-48a5576acc90b2c2c4dc446467c8a7dc9ca80fe8.zip | |
am f34ed01f: Merge "Make the implementations of RIL_onUnsolicitedResponse match the prototypes"
* commit 'f34ed01f1e1935c67e153916ea27dddae4d067dc':
Make the implementations of RIL_onUnsolicitedResponse match the prototypes
| -rw-r--r-- | libril/ril.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp index 8936f36..1fd63a2 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -4424,11 +4424,11 @@ processRadioState(RIL_RadioState newRadioState, RIL_SOCKET_ID socket_id) { #if defined(ANDROID_MULTI_SIM) extern "C" -void RIL_onUnsolicitedResponse(int unsolResponse, void *data, +void RIL_onUnsolicitedResponse(int unsolResponse, const void *data, size_t datalen, RIL_SOCKET_ID socket_id) #else extern "C" -void RIL_onUnsolicitedResponse(int unsolResponse, void *data, +void RIL_onUnsolicitedResponse(int unsolResponse, const void *data, size_t datalen) #endif { |