diff options
| author | Peter Wang <tpwang@google.com> | 2019-11-12 15:44:58 -0800 |
|---|---|---|
| committer | Peter Wang <tpwang@google.com> | 2019-11-14 03:35:25 +0000 |
| commit | 7e16b391b6b2373daea6d8b41e7fc2848fc07456 (patch) | |
| tree | f296f0545a7aec27a748e9f97fc7b649a6dcaa41 /core/java/android | |
| parent | 6e5fd21a65e1dad52ebb1141b6dac9ae6baee996 (diff) | |
[API Review] Renamed public API eraseSubscriptionsWithOptions
to without "withOptions", aidl definitions for EuiccController,
EuiccService are kept unchanged
Bug: 139474431
Bug: 143986109
Test: Build
Change-Id: Ic11bae7a24c99995b76dd4c5ef764f8a87deed52
Merged-In: Ic11bae7a24c99995b76dd4c5ef764f8a87deed52
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/euicc/EuiccService.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/service/euicc/EuiccService.java b/core/java/android/service/euicc/EuiccService.java index 12c25806d666..21c3be3df1fc 100644 --- a/core/java/android/service/euicc/EuiccService.java +++ b/core/java/android/service/euicc/EuiccService.java @@ -516,7 +516,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); @@ -533,7 +533,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"); } @@ -779,8 +779,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) { |