Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50d9c5fa authored by Arun Voddu's avatar Arun Voddu Committed by Automerger Merge Worker
Browse files

Merge "NPE fix when reading the port index from uiccslot in logger" into main... 

Merge "NPE fix when reading the port index from uiccslot in logger" into main am: a15c24b2 am: e3f4bec1 am: c02a427a am: 4578560c am: b691f6c5 am: 4fd16d1e

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2639531



Change-Id: Id24aaaa666cd8a9e588475152455fcd395ccf618
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a538173 4fd16d1e

src/java/com/android/internal/telephony/uicc/UiccController.java

+4 −2
Original line number Diff line number Diff line
@@ -804,12 +804,14 @@ public class UiccController extends Handler { 
            UiccSlot slot = UiccController.getInstance().getUiccSlotForPhone(phoneId);

            int slotId = UiccController.getInstance().getSlotIdFromPhoneId(phoneId);

            intent.putExtra(PhoneConstants.SLOT_KEY, slotId);

            int portIndex = -1;

            if (slot != null) {

                intent.putExtra(PhoneConstants.PORT_KEY, slot.getPortIndexFromPhoneId(phoneId));

                portIndex = slot.getPortIndexFromPhoneId(phoneId);

                intent.putExtra(PhoneConstants.PORT_KEY, portIndex);

            }

            Rlog.d(LOG_TAG, "Broadcasting intent ACTION_SIM_CARD_STATE_CHANGED "

                    + TelephonyManager.simStateToString(state) + " for phone: " + phoneId

                    + " slot: " + slotId + " port: " + slot.getPortIndexFromPhoneId(phoneId));

                    + " slot: " + slotId + " port: " + portIndex);

            mContext.sendBroadcast(intent, Manifest.permission.READ_PRIVILEGED_PHONE_STATE);

            TelephonyMetrics.getInstance().updateSimState(phoneId, state);

        }