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

Commit 7f10b8ea authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

Keyguard: Avoid array index out of bounds exception 

When change sim configuration from dual to single card,
SubscriptionManager.getActiveSubInfoList() may get dual sim SubInfoRecord.

Check the slotId whether it is out of the array bounds.

CRs-Fixed: 755524

Change-Id: Ib58fe691c68a9df8eb2d642bde6d5aaa094c4ef7
parent 97da2135

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+3 −0
Original line number Diff line number Diff line
@@ -679,6 +679,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
            for (SubInfoRecord subInfo: activeSubInfos) {

                //subId for the slot initially initiazed to invalid value

                //Got intent with correct subId for the slot now.

                if (subInfo.slotId > getNumPhones() - 1) {

                    continue;

                }

                if (mSubIdForSlot[subInfo.slotId] != subInfo.subId) {

                    long subId = mSubIdForSlot[subInfo.slotId];

                    mSimState.put(subInfo.subId, mSimState.get(subId));