diff options
| author | Naveen Kalla <mrnaveen@google.com> | 2016-11-08 18:07:56 -0800 |
|---|---|---|
| committer | Naveen Kalla <mrnaveen@google.com> | 2016-11-08 18:09:52 -0800 |
| commit | bb43e36633d421a57f5e681b1599339a1ca6f0f9 (patch) | |
| tree | bff145853af015198f101a85c41a733dc0b72ea3 /reference-ril | |
| parent | ff18e415e28a3a6b8eb5b2772c10d1b97dd1e9f9 (diff) | |
| parent | 56ad8b45b7e47b7e3b5269738f55874f77ba331c (diff) | |
| download | android_hardware_ril-bb43e36633d421a57f5e681b1599339a1ca6f0f9.tar.gz android_hardware_ril-bb43e36633d421a57f5e681b1599339a1ca6f0f9.tar.bz2 android_hardware_ril-bb43e36633d421a57f5e681b1599339a1ca6f0f9.zip | |
resolve merge conflicts of 56ad8b4 to master
Test: Build successfully
Change-Id: Ie317dca9dccf4d9cb77c821f7c97643fd8f34a19
Diffstat (limited to 'reference-ril')
| -rw-r--r-- | reference-ril/reference-ril.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 31ce3b0..8a9f48a 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -156,7 +156,7 @@ static int is3gpp2(int radioTech) { typedef enum { SIM_ABSENT = 0, SIM_NOT_READY = 1, - SIM_READY = 2, /* SIM_READY means the radio state is RADIO_STATE_SIM_READY */ + SIM_READY = 2, SIM_PIN = 3, SIM_PUK = 4, SIM_NETWORK_PERSONALIZATION = 5, @@ -2772,7 +2772,7 @@ static void pollSIMState (void *param __unused) ATResponse *p_response; int ret; - if (sState != RADIO_STATE_SIM_NOT_READY) { + if (sState != RADIO_STATE_UNAVAILABLE) { // no longer valid to poll return; } |