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

Commit 9a6338cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix for NPE in KeyguardUpdateMonitor" into main

parents d3a5b9b3 9c8106e1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3811,7 +3811,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
        if (!mSimDatas.containsKey(subId)) {
            refreshSimState(subId, SubscriptionManager.getSlotIndex(subId));
        }
        return mSimDatas.get(subId).slotId;
        SimData simData = mSimDatas.get(subId);
        return simData != null ? simData.slotId : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
    }

    private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {