From f0af4a6995228d1acc51cdaacb633f1910ce568c Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 21 Feb 2020 17:11:57 -0800 Subject: [PATCH] Re-order parameters of setUiccApplicationsEnabled. To be consistent with other APIs, based on API council's feedback. Bug: 148179539 Test: build Change-Id: I1d4a2bf7dfc01842f583e02517986a8bf043bfde Merged-In: I1d4a2bf7dfc01842f583e02517986a8bf043bfde --- api/system-current.txt | 2 +- telephony/java/android/telephony/SubscriptionManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 9a1aacd04393f..f62c9b7adbca8 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11616,7 +11616,7 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIconTint(@ColorInt int, int); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer); 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 diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index b32e9d73a141a..4d6c657d8647c 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -3081,13 +3081,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); }