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

Commit 6ad3e13b authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Make set/get user handle APIs hidden." into udc-dev

parents ec71863d 82ecd944

core/api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -14615,7 +14615,6 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);

    method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public android.os.UserHandle getSubscriptionUserHandle(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);

    method public void requestEmbeddedSubscriptionInfoListRefresh();

    method public void requestEmbeddedSubscriptionInfoListRefresh(int);
@@ -14625,7 +14624,6 @@ 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.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public void setSubscriptionUserHandle(int, @Nullable android.os.UserHandle);

    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;

telephony/java/android/telephony/SubscriptionManager.java

+0 −2
Original line number Diff line number Diff line
@@ -4374,7 +4374,6 @@ public class SubscriptionManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION)

    public void setSubscriptionUserHandle(int subscriptionId, @Nullable UserHandle userHandle) {

        if (!isValidSubscriptionId(subscriptionId)) {
@@ -4409,7 +4408,6 @@ public class SubscriptionManager { 
     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION)

    public @Nullable UserHandle getSubscriptionUserHandle(int subscriptionId) {

        if (!isValidSubscriptionId(subscriptionId)) {