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

Commit 5b486bc3 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

Merge "Use PHONE_KEY instead of SLOT_KEY as telephony always passes phoneId...

Merge "Use PHONE_KEY instead of SLOT_KEY as telephony always passes phoneId isntead of slotId" into qt-dev
am: 152cc76b

Change-Id: I23e6d6998042cee6947ea0b0a5f0ebd32fc7d823
parents f1ddec0a 152cc76b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                throw new IllegalArgumentException("only handles intent ACTION_SIM_STATE_CHANGED");
            }
            String stateExtra = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);
            int slotId = intent.getIntExtra(PhoneConstants.SLOT_KEY, 0);
            int slotId = intent.getIntExtra(PhoneConstants.PHONE_KEY, 0);
            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
            if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) {