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

Commit b6ba2471 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose EXTRA_SUB_ID."

parents 4a55f0ad f32f7b45

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35177,6 +35177,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

    field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id";

    field public static final java.lang.String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";

    field public static final java.lang.String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";

    field public static final java.lang.String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";

  }

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -38243,6 +38243,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

    field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id";

    field public static final java.lang.String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";

    field public static final java.lang.String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";

    field public static final java.lang.String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";

  }

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35449,6 +35449,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

    field public static final java.lang.String EXTRA_INPUT_METHOD_ID = "input_method_id";

    field public static final java.lang.String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";

    field public static final java.lang.String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";

    field public static final java.lang.String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";

  }

core/java/android/provider/Settings.java

+10 −2
Original line number Diff line number Diff line
@@ -211,8 +211,13 @@ public final class Settings { 


    /** @hide */

    public static final String EXTRA_NETWORK_TEMPLATE = "network_template";

    /** @hide */

    public static final String EXTRA_SUB_ID = "sub_id";



    /**

     * An int extra specifying a subscription ID.

     *

     * @see android.telephony.SubscriptionInfo#getSubscriptionId

     */

    public static final String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";



    /**

     * Activity Action: Modify Airplane mode settings using a voice command.
@@ -916,6 +921,9 @@ public final class Settings { 
     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * The subscription ID of the subscription for which available network operators should be

     * displayed may be optionally specified with {@link #EXTRA_SUB_ID}.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.