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

Commit 6b39bac3 authored by Daniel Bright's avatar Daniel Bright Committed by Gerrit Code Review
Browse files

Merge "Make SystemApi ACTION_SUBSCRIPTION_PLANS_CHANGED"

parents 30b2ac71 10aa8e78

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8882,6 +8882,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);

    field @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_PLANS) public static final String ACTION_SUBSCRIPTION_PLANS_CHANGED = "android.telephony.action.SUBSCRIPTION_PLANS_CHANGED";

    field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;

    field public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff

    field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2

telephony/java/android/telephony/SubscriptionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -912,9 +912,9 @@ public class SubscriptionManager { 
     * <p>

     * Contains {@link #EXTRA_SUBSCRIPTION_INDEX} to indicate which subscription

     * changed.

     *

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_PLANS)

    public static final String ACTION_SUBSCRIPTION_PLANS_CHANGED