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

Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev

Browse Source
This commit is contained in:
Jordan Liu
2019-04-23 20:40:09 +00:00
committed by Android (Google) Code Review
parent 6db82f8965 656f6f8b66
commit 5a3afc8ce7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -2064,7 +2064,6 @@ public class SubscriptionManager {
} else { } else {
logd("putPhoneIdAndSubIdExtra: no valid subs"); logd("putPhoneIdAndSubIdExtra: no valid subs");
intent.putExtra(PhoneConstants.PHONE_KEY, phoneId); intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);
} }
} }
@@ -2075,9 +2074,6 @@ public class SubscriptionManager {
intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId); intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId);
intent.putExtra(PhoneConstants.PHONE_KEY, phoneId); intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
//FIXME this is using phoneId and slotIndex interchangeably
//Eventually, this should be removed as it is not the slot id
intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);
} }
/** /**