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

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

Merge "Add annotation for EuiccManager#updateSubscriptionNickname."

parents 54d2e21a f6fc4eec

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -45554,7 +45554,7 @@ package android.telephony.euicc { 
    method public boolean isEnabled();

    method public void startResolutionActivity(android.app.Activity, int, android.content.Intent, android.app.PendingIntent) throws android.content.IntentSender.SendIntentException;

    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, android.app.PendingIntent);

    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void updateSubscriptionNickname(int, String, android.app.PendingIntent);

    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void updateSubscriptionNickname(int, @Nullable String, @NonNull android.app.PendingIntent);

    field public static final String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS";

    field public static final String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE";

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

telephony/java/android/telephony/euicc/EuiccManager.java

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ public class EuiccManager { 
     */

    @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

    public void updateSubscriptionNickname(

            int subscriptionId, String nickname, PendingIntent callbackIntent) {

            int subscriptionId, @Nullable String nickname, @NonNull PendingIntent callbackIntent) {

        if (!refreshCardIdIfUninitialized()) {

            sendUnavailableError(callbackIntent);

            return;