diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-12-02 16:46:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-02 16:46:29 -0800 |
| commit | a65281c96e05e4e3afac1dc4b76062518f804392 (patch) | |
| tree | f1351b33d878517d36a451173b7f168b56a0778f | |
| parent | 9b50ac9401bf89f61b9c6ae2534771743ff33913 (diff) | |
| parent | bb1a5b4e7c6e8fafa7700877d3636e1549857d9f (diff) | |
| download | telephony-temp_b_145570283.tar.gz | |
Merge "Initialize new mPhoneIdToSlotId item to INVALID_SLOT_ID upon ss->ds switch."temp_b_145570283
am: bb1a5b4e7c
Change-Id: If23b3b2dbe42534f650f0ddd4c79f013c91309d4
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index a7bce9c4b7..720ad75456 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -546,7 +546,11 @@ public class UiccController extends Handler { // Resize array. mPhoneIdToSlotId = copyOf(mPhoneIdToSlotId, mCis.length); + // Register for new active modem for ss -> ds switch. + // For ds -> ss switch, there's no need to unregister as the mCis should unregister + // everything itself. for (int i = prevActiveModemCount; i < mCis.length; i++) { + mPhoneIdToSlotId[i] = INVALID_SLOT_ID; mCis[i].registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, i); /* |