diff options
| author | Diego Wilson <diegowilson@google.com> | 2018-03-22 19:44:17 -0700 |
|---|---|---|
| committer | Diego Wilson <diegowilson@google.com> | 2018-03-22 19:44:17 -0700 |
| commit | 4415af1fc566ee991dc31ed6115e48d0ee4ae152 (patch) | |
| tree | 183d4aba6c651e321fd15954d28ec79e5ef53566 | |
| parent | 7e03807fdd448fe4c5b5149d05cd3165c8d69e1c (diff) | |
| parent | 8b61ddf122086cafbc23d2f66188b94f6e397d6e (diff) | |
| download | android_hardware_ril-4415af1fc566ee991dc31ed6115e48d0ee4ae152.tar.gz android_hardware_ril-4415af1fc566ee991dc31ed6115e48d0ee4ae152.tar.bz2 android_hardware_ril-4415af1fc566ee991dc31ed6115e48d0ee4ae152.zip | |
Merge Qualcomm release PPR1.180321.001
Change-Id: I7b0bbce3b3dc1e25b19f17730b36a1a0e90b2460
| -rw-r--r-- | reference-ril/reference-ril.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 4697f90..084c4ad 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -1218,6 +1218,7 @@ static void requestDeviceIdentity(int request __unused, void *data __unused, responseStr[0] = "----"; responseStr[1] = "----"; responseStr[2] = "77777777"; + responseStr[3] = ""; // default empty for non-CDMA err = at_send_command_numeric("AT+CGSN", &p_response); if (err < 0 || p_response->success == 0) { @@ -2229,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 @@ -2243,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 } } } @@ -3055,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, @@ -3529,7 +3533,7 @@ static void onUnsolicited (const char *s, const char *sms_pdu) } else { RIL_onUnsolicitedResponse ( RIL_UNSOL_NITZ_TIME_RECEIVED, - response, strlen(response)); + response, strlen(response) + 1); } free(line); } else if (strStartsWith(s,"+CRING:") |