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

Commit fcb238c9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Populate the subId for the slotId before calling the subIdUpdated callback"

parents 152f63e7 d89ca01a

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

+1 −1
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                //Got intent with correct subId for the slot now.

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

                    long subId = mSubIdForSlot[subInfo.slotId];

                    mSubIdForSlot[subInfo.slotId] = subInfo.subId;

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

                    mSpn.put(subInfo.subId, mSpn.get(subId));
@@ -689,7 +690,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                        }

                    }

                }

                mSubIdForSlot[subInfo.slotId] = subInfo.subId;

                if (DEBUG) {

                    Log.d(TAG, "handleSubInfoRecordUpdate mSubIdForSlot["

                        + subInfo.slotId + "] = " + subInfo.subId);