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

am: 152cc76bc0

Change-Id: I7ea3480cc5d7b5a5d9c1764a314723eb98f27d4e
This commit is contained in:
Jayachandran Chinnakkannu
2019-05-22 10:28:24 -07:00
committed by android-build-merger

View File

@@ -1197,7 +1197,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)) {