Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-05-22 16:20:28 +00:00
committed by Android (Google) Code Review
parent 6494b52f39 bd481355e6
commit 152cc76bc0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -1187,7 +1187,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
throw new IllegalArgumentException("only handles intent ACTION_SIM_STATE_CHANGED"); throw new IllegalArgumentException("only handles intent ACTION_SIM_STATE_CHANGED");
} }
String stateExtra = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE); 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, int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.INVALID_SUBSCRIPTION_ID); SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) { if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) {