diff options
| author | Wink Saville <wink@google.com> | 2013-07-30 04:55:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-30 04:55:11 +0000 |
| commit | 24a5c46926c45ce69c83b256b9e3b41647516ad9 (patch) | |
| tree | 88ab7fa2b80d59ac9ff016470b8ba1a23cd56461 | |
| parent | 83b1d8d9af8f7f7bf424af6faf229cfc04e0c896 (diff) | |
| parent | 5802701949894c743dc95731091af94307c54bd0 (diff) | |
| download | platform_hardware_ril-tools_r22.2.tar.gz platform_hardware_ril-tools_r22.2.tar.bz2 platform_hardware_ril-tools_r22.2.zip | |
Merge "Fix libril.so crash issue caused by wrong switch logic of onRequest in reference-ril.c"tools_r22.2
| -rw-r--r-- | reference-ril/reference-ril.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index facd223f..77c6f319 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -2185,6 +2185,14 @@ onRequest (int request, void *data, size_t datalen, RIL_Token t) requestGetPreferredNetworkType(request, data, datalen, t); break; + case RIL_REQUEST_GET_CELL_INFO_LIST: + requestGetCellInfoList(data, datalen, t); + break; + + case RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE: + requestSetCellInfoListRate(data, datalen, t); + break; + /* CDMA Specific Requests */ case RIL_REQUEST_BASEBAND_VERSION: if (TECH_BIT(sMdmInfo) == MDM_CDMA) { @@ -2234,14 +2242,6 @@ onRequest (int request, void *data, size_t datalen, RIL_Token t) break; } // Fall-through if tech is not cdma - case RIL_REQUEST_GET_CELL_INFO_LIST: - requestGetCellInfoList(data, datalen, t); - break; - - case RIL_REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE: - requestSetCellInfoListRate(data, datalen, t); - break; - default: RLOGD("Request not supported. Tech: %d",TECH(sMdmInfo)); RIL_onRequestComplete(t, RIL_E_REQUEST_NOT_SUPPORTED, NULL, 0); |