| commit | 1d957c585e7b1d0a18b82e724ff446dda4fb11be | [log] [tgz] |
|---|---|---|
| author | Holly Jiuyu Sun <jiuyu@google.com> | Wed Apr 04 13:52:42 2018 -0700 |
| committer | Holly Jiuyu Sun <jiuyu@google.com> | Fri Apr 06 18:04:02 2018 -0700 |
| tree | e74499603f7b8e8eae53167b2416fb4bed22e82f | |
| parent | f096dcb10940b840e389f6e7bba189461a38c587 [diff] |
Fix the issue on reading cardId. We should get the card from the slot first. Check whether the card is null. If not null, get the cardId. If the card is null, just set the cardId as null. The index for getUiccCard() should be phoneId, which is inconsistent with the previously given physical slot id. It's possible that UiccController#getUiccCard() returns a null card and thus cause NPE. Bug: 77607791 Test: test on phone Change-Id: I6e145612398e798be0b370ccb59004c5df25f8c4