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

Commit 3c177c45 authored by Peter Wang's avatar Peter Wang Committed by Android (Google) Code Review
Browse files

Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions"

parents 3212ad01 c0bb377b

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6820,7 +6820,7 @@ package android.service.euicc { 
    method public android.service.euicc.DownloadSubscriptionResult onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean, @Nullable android.os.Bundle);

    method @Deprecated public int onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean);

    method @Deprecated public abstract int onEraseSubscriptions(int);

    method public int onEraseSubscriptionsWithOptions(int, @android.telephony.euicc.EuiccCardManager.ResetOption int);

    method public int onEraseSubscriptions(int, @android.telephony.euicc.EuiccCardManager.ResetOption int);

    method public abstract android.service.euicc.GetDefaultDownloadableSubscriptionListResult onGetDefaultDownloadableSubscriptionList(int, boolean);

    method public abstract android.service.euicc.GetDownloadableSubscriptionMetadataResult onGetDownloadableSubscriptionMetadata(int, android.telephony.euicc.DownloadableSubscription, boolean);

    method public abstract String onGetEid(int);
@@ -8951,7 +8951,7 @@ package android.telephony.euicc { 
  public class EuiccManager {

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void continueOperation(android.content.Intent, android.os.Bundle);

    method @Deprecated @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(@NonNull android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptionsWithOptions(@android.telephony.euicc.EuiccCardManager.ResetOption int, @NonNull android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void eraseSubscriptions(@android.telephony.euicc.EuiccCardManager.ResetOption int, @NonNull android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDefaultDownloadableSubscriptionList(android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public void getDownloadableSubscriptionMetadata(android.telephony.euicc.DownloadableSubscription, android.app.PendingIntent);

    method @RequiresPermission(android.Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS) public int getOtaStatus();

core/java/android/service/euicc/EuiccService.java

+3 −4
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ public abstract class EuiccService extends Service { 
     * @see android.telephony.euicc.EuiccManager#eraseSubscriptions

     *

     * @deprecated From R, callers should specify a flag for specific set of subscriptions to erase

     * and use {@link #onEraseSubscriptionsWithOptions(int, int)} instead

     * and use {@link #onEraseSubscriptions(int, int)} instead

     */

    @Deprecated

    public abstract int onEraseSubscriptions(int slotId);
@@ -563,7 +563,7 @@ public abstract class EuiccService extends Service { 
     *     constants or any implementation-specific code starting with {@link #RESULT_FIRST_USER}.

     * @see android.telephony.euicc.EuiccManager#eraseSubscriptionsWithOptions

     */

    public int onEraseSubscriptionsWithOptions(int slotIndex, @ResetOption int options) {

    public int onEraseSubscriptions(int slotIndex, @ResetOption int options) {

        throw new UnsupportedOperationException(

                "This method must be overridden to enable the ResetOption parameter");

    }
@@ -809,8 +809,7 @@ public abstract class EuiccService extends Service { 
            mExecutor.execute(new Runnable() {

                @Override

                public void run() {

                    int result = EuiccService.this.onEraseSubscriptionsWithOptions(

                            slotIndex, options);

                    int result = EuiccService.this.onEraseSubscriptions(slotIndex, options);

                    try {

                        callback.onComplete(result);

                    } catch (RemoteException e) {

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

+2 −2
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ public class EuiccManager { 
     * @param callbackIntent a PendingIntent to launch when the operation completes.

     *

     * @deprecated From R, callers should specify a flag for specific set of subscriptions to erase

     * and use {@link #eraseSubscriptionsWithOptions(int, PendingIntent)} instead

     * and use {@link #eraseSubscriptions(int, PendingIntent)} instead

     *

     * @hide

     */
@@ -895,7 +895,7 @@ public class EuiccManager { 
     */

    @SystemApi

    @RequiresPermission(Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS)

    public void eraseSubscriptionsWithOptions(

    public void eraseSubscriptions(

            @ResetOption int options, @NonNull PendingIntent callbackIntent) {

        if (!isEnabled()) {

            sendUnavailableError(callbackIntent);