diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-14 07:25:25 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-14 07:25:25 +0000 |
| commit | 6706bcd9fe8e7a09065b68b94612793eff576adf (patch) | |
| tree | 90d7a0593768c484e85bc29300f4a6a00820a000 | |
| parent | 1c835044cc11410a105af1b8ae6b9b0f4b54795e (diff) | |
| parent | 2d9f8af0f6334ded55c7850e5d12d480881fcc8f (diff) | |
| download | android_hardware_ril-6706bcd9fe8e7a09065b68b94612793eff576adf.tar.gz android_hardware_ril-6706bcd9fe8e7a09065b68b94612793eff576adf.tar.bz2 android_hardware_ril-6706bcd9fe8e7a09065b68b94612793eff576adf.zip | |
Snap for 4653471 from 2d9f8af0f6334ded55c7850e5d12d480881fcc8f to pi-release
Change-Id: Idcc2e103f020883492e0edffa2398399283d441b
| -rw-r--r-- | reference-ril/reference-ril.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 0e84d69..81bf8d5 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -2230,7 +2230,7 @@ static int techFromModemType(int mdmtype) static void requestGetCellInfoList(void *data __unused, size_t datalen __unused, RIL_Token t) { uint64_t curTime = ril_nano_time(); - RIL_CellInfo ci[1] = + RIL_CellInfo_v12 ci[1] = { { // ci[0] 1, // cellInfoType @@ -2244,10 +2244,13 @@ static void requestGetCellInfoList(void *data __unused, size_t datalen __unused, s_mnc, // mnc s_lac, // lac s_cid, // cid + 0, //arfcn unknown + 0xFF, // bsic unknown }, { // gsm.signalStrengthGsm 10, // signalStrength 0 // bitErrorRate + , INT_MAX // timingAdvance invalid value } } } @@ -3056,19 +3059,19 @@ static int getCardStatus(RIL_CardStatus_v6 **pp_card_status) { { RIL_APPTYPE_UNKNOWN, RIL_APPSTATE_UNKNOWN, RIL_PERSOSUBSTATE_UNKNOWN, NULL, NULL, 0, RIL_PINSTATE_UNKNOWN, RIL_PINSTATE_UNKNOWN }, // SIM_NOT_READY = 1 - { RIL_APPTYPE_SIM, RIL_APPSTATE_DETECTED, RIL_PERSOSUBSTATE_UNKNOWN, + { RIL_APPTYPE_USIM, RIL_APPSTATE_DETECTED, RIL_PERSOSUBSTATE_UNKNOWN, NULL, NULL, 0, RIL_PINSTATE_UNKNOWN, RIL_PINSTATE_UNKNOWN }, // SIM_READY = 2 - { RIL_APPTYPE_SIM, RIL_APPSTATE_READY, RIL_PERSOSUBSTATE_READY, + { RIL_APPTYPE_USIM, RIL_APPSTATE_READY, RIL_PERSOSUBSTATE_READY, NULL, NULL, 0, RIL_PINSTATE_UNKNOWN, RIL_PINSTATE_UNKNOWN }, // SIM_PIN = 3 - { RIL_APPTYPE_SIM, RIL_APPSTATE_PIN, RIL_PERSOSUBSTATE_UNKNOWN, + { RIL_APPTYPE_USIM, RIL_APPSTATE_PIN, RIL_PERSOSUBSTATE_UNKNOWN, NULL, NULL, 0, RIL_PINSTATE_ENABLED_NOT_VERIFIED, RIL_PINSTATE_UNKNOWN }, // SIM_PUK = 4 - { RIL_APPTYPE_SIM, RIL_APPSTATE_PUK, RIL_PERSOSUBSTATE_UNKNOWN, + { RIL_APPTYPE_USIM, RIL_APPSTATE_PUK, RIL_PERSOSUBSTATE_UNKNOWN, NULL, NULL, 0, RIL_PINSTATE_ENABLED_BLOCKED, RIL_PINSTATE_UNKNOWN }, // SIM_NETWORK_PERSONALIZATION = 5 - { RIL_APPTYPE_SIM, RIL_APPSTATE_SUBSCRIPTION_PERSO, RIL_PERSOSUBSTATE_SIM_NETWORK, + { RIL_APPTYPE_USIM, RIL_APPSTATE_SUBSCRIPTION_PERSO, RIL_PERSOSUBSTATE_SIM_NETWORK, NULL, NULL, 0, RIL_PINSTATE_ENABLED_NOT_VERIFIED, RIL_PINSTATE_UNKNOWN }, // RUIM_ABSENT = 6 { RIL_APPTYPE_UNKNOWN, RIL_APPSTATE_UNKNOWN, RIL_PERSOSUBSTATE_UNKNOWN, |