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

Commit 9077faab authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Make some intents public in SubscriptionManager." into oc-dev

parents 64731b1d 2c1a49f9

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -9276,6 +9276,8 @@ package android.content { 
    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";

    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";

    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
@@ -9477,6 +9479,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -9787,6 +9787,8 @@ package android.content { 
    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";

    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";

    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
@@ -10008,6 +10010,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME";

    field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -9309,6 +9309,8 @@ package android.content { 
    field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT";

    field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW";

    field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";

    field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW";

    field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";
@@ -9510,6 +9512,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY";

    field public static final deprecated java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM";

    field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT";

    field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE";

    field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT";

    field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE";

core/java/android/content/Intent.java

+26 −0
Original line number Diff line number Diff line
@@ -3352,6 +3352,32 @@ public class Intent implements Parcelable, Cloneable { 
    public static final String

            ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED";



    /**

     * Broadcast Action: The default subscription has changed.  This has the following

     * extra values:</p>

     * The {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default subscription index

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED

            = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED";



    /**

     * Broadcast Action: The default sms subscription has changed.  This has the following

     * extra values:</p>

     * {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default sms

     * subscription index

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED

            = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED";



    /**

     * Integer extra used with {@link #ACTION_DEFAULT_SUBSCRIPTION_CHANGED} and

     * {@link #ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} to indicate the subscription

     * which has changed.

     */

    public static final String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX";



    /**

     * Deprecated - use {@link #ACTION_FACTORY_RESET} instead.

     *

telephony/java/android/telephony/SubscriptionManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,7 @@ public class SubscriptionManager { 
    public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) {

        if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId);

        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(Intent.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