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

Commit 0520203a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Re-order parameters of setUiccApplicationsEnabled." am: deb27cc3 

Change-Id: I6bda4c644a1f238992a0e31442d78eb9c449d9b3
parents 0a5acf61 deb27cc3

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9274,7 +9274,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);

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

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(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

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3186,13 +3186,13 @@ public class SubscriptionManager { 
     *

     * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required

     *

     * @param enabled whether uicc applications are enabled or disabled.

     * @param subscriptionId which subscription to operate on.

     * @param enabled whether uicc applications are enabled or disabled.

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public void setUiccApplicationsEnabled(boolean enabled, int subscriptionId) {

    public void setUiccApplicationsEnabled(int subscriptionId, boolean enabled) {

        if (VDBG) {

            logd("setUiccApplicationsEnabled subId= " + subscriptionId + " enable " + enabled);

        }