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

Commit 93380ab8 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by android-build-merger
Browse files

Merge "Allow privileged carrier app to update subscription nickname." am: 81801283 

am: a5972ee7

Change-Id: I869efbd602fb484960dfca484b9ee4d9fb14ee5b
parents f60ebe5c a5972ee7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43430,6 +43430,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 public void switchToSubscription(int, android.app.PendingIntent);

    method public void updateSubscriptionNickname(int, java.lang.String, android.app.PendingIntent);

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

    field public static final java.lang.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

+4 −5
Original line number Diff line number Diff line
@@ -546,14 +546,13 @@ public class EuiccManager { 
    /**

     * Update the nickname for the given subscription.

     *

     * <p>Requires that the calling app has the

     * {@link android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission. This is for

     * internal system use only.

     * <p>Requires that the calling app has carrier privileges according to the metadata of the

     * profile to be updated, or the

     * {@code android.Manifest.permission#WRITE_EMBEDDED_SUBSCRIPTIONS} permission.

     *

     * @param subscriptionId the ID of the subscription to update.

     * @param nickname the new nickname to apply.

     * @param callbackIntent a PendingIntent to launch when the operation completes.

     * @hide

     */

    @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

    public void updateSubscriptionNickname(
@@ -564,7 +563,7 @@ public class EuiccManager { 
        }

        try {

            getIEuiccController().updateSubscriptionNickname(

                    subscriptionId, nickname, callbackIntent);

                    subscriptionId, nickname, mContext.getOpPackageName(), callbackIntent);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ interface IEuiccController { 
    oneway void switchToSubscription(int subscriptionId, String callingPackage,

        in PendingIntent callbackIntent);

    oneway void updateSubscriptionNickname(int subscriptionId, String nickname,

        in PendingIntent callbackIntent);

        String callingPackage, in PendingIntent callbackIntent);

    oneway void eraseSubscriptions(in PendingIntent callbackIntent);

    oneway void retainSubscriptionsForFactoryReset(in PendingIntent callbackIntent);

}
 
 No newline at end of file