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

Commit dd50042f authored by Jordan Liu's avatar Jordan Liu
Browse files

Do not populate SLOT_KEY with wrong slot info 

The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).

For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.

Bug: 130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
Merged-In: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
parent da2b966f

telephony/java/android/telephony/SubscriptionManager.java

+0 −4
Original line number Diff line number Diff line
@@ -2057,7 +2057,6 @@ public class SubscriptionManager { 
        } else {

            logd("putPhoneIdAndSubIdExtra: no valid subs");

            intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);

            intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);

        }

    }
@@ -2068,9 +2067,6 @@ public class SubscriptionManager { 
        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId);

        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);

    }



    /**