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

Commit 45db25d7 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "using the correct intent extra for subId"

parents 9166e893 379e5310

services/core/java/com/android/server/TelephonyRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        intent.putExtras(data);

        // Pass the subscription along with the intent.

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);

        mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

    }
@@ -1698,6 +1699,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            intent.setAction(PhoneConstants.ACTION_SUBSCRIPTION_PHONE_STATE_CHANGED);

            intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

            intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);

        }

        // If the phoneId is invalid, the broadcast is for overall call state.

        if (phoneId != SubscriptionManager.INVALID_PHONE_INDEX) {

telephony/java/com/android/internal/telephony/PhoneConstants.java

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ public class PhoneConstants { 


    // FIXME: This is used to pass a subId via intents, we need to look at its usage, which is

    // FIXME: extensive, and see if this should be an array of all active subId's or ...?

    /**

     * @Deprecated use {@link android.telephony.SubscriptionManager#EXTRA_SUBSCRIPTION_INDEX}

     * instead.

     */

    public static final String SUBSCRIPTION_KEY  = "subscription";



    public static final String SUB_SETTING  = "subSettings";