diff options
| author | Peter Wang <tpwang@google.com> | 2019-11-14 11:11:37 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-14 11:11:37 -0800 |
| commit | ded3d9152e8adb1b46a3a3a1b0531a97bc22123e (patch) | |
| tree | 9d3d6fab99c1c1c17e01080480b17918d6285070 /core/java | |
| parent | 74c9a01da29fe536fe91e172ef123a13d4205002 (diff) | |
| parent | 451c6a80e5963ad0c9ec7ea70aa123445591dad3 (diff) | |
Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions"
am: 451c6a80e5
Change-Id: If559af58f06c0b7d8e9c118752cfdf82877761e7
Diffstat (limited to 'core/java')
| -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) { |