diff options
| author | bohu <bohu@google.com> | 2017-05-01 14:59:00 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2018-03-12 16:30:37 -0700 |
| commit | 48170a0b6cac8e791a05a8df4363ba0db579dda6 (patch) | |
| tree | c0200952e5e4f095c7996ed201aa56b413cad7a3 | |
| parent | 8c1da5b30cd4e01dd587d0b7ada8383b54b63879 (diff) | |
| download | android_hardware_ril-48170a0b6cac8e791a05a8df4363ba0db579dda6.tar.gz android_hardware_ril-48170a0b6cac8e791a05a8df4363ba0db579dda6.tar.bz2 android_hardware_ril-48170a0b6cac8e791a05a8df4363ba0db579dda6.zip | |
Emulator: use APPTYPE_USIM instead of APPTYPE_SIM
The USIM is assumed to be available by default now.
(previously SIM is default)
BUG: 72886046
Test: run cts -m CtsTelephonyTestCases -t
android.telephony.cts.TelephonyManagerTest#testGetForbiddenPlmns
Change-Id: I7161df9eb0317cf2c6978b5b4af2332ce91da8a9
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | reference-ril/reference-ril.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 0e84d69..f8ea155 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -3056,19 +3056,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, |