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

Commit b5b73121 authored by Jiuyu Sun's avatar Jiuyu Sun Committed by Android (Google) Code Review
Browse files

Merge "Address comments from API review." into qt-dev

parents 47289344 c67c86c7

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6497,7 +6497,7 @@ package android.service.euicc { 
    ctor public EuiccService();

    method @CallSuper public android.os.IBinder onBind(android.content.Intent);

    method public abstract int onDeleteSubscription(int, String);

    method public abstract android.service.euicc.DownloadSubscriptionResult onDownloadSubscription(int, @NonNull android.telephony.euicc.DownloadableSubscription, boolean, boolean, @Nullable android.os.Bundle);

    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 public abstract int onEraseSubscriptions(int);

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

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

+10 −7
Original line number Diff line number Diff line
@@ -418,12 +418,15 @@ public abstract class EuiccService extends Service { 
     *     bit map, and original the card Id. The result code may be one of the predefined

     *     {@code RESULT_} constants or any implementation-specific code starting with

     *     {@link #RESULT_FIRST_USER}. The resolvable error bit map can be either 0 or values

     *     defined in {@code RESOLVABLE_ERROR_}.

     *     defined in {@code RESOLVABLE_ERROR_}. A subclass should override this method. Otherwise,

     *     this method does nothing and returns null by default.

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

     */

    public abstract DownloadSubscriptionResult onDownloadSubscription(int slotId,

    public DownloadSubscriptionResult onDownloadSubscription(int slotId,

            @NonNull DownloadableSubscription subscription, boolean switchAfterDownload,

            boolean forceDeactivateSim, @Nullable Bundle resolvedBundle);

            boolean forceDeactivateSim, @Nullable Bundle resolvedBundle) {

        return null;

    }



    /**

     * Download the given subscription.
@@ -439,14 +442,14 @@ public abstract class EuiccService extends Service { 
     *     constants or any implementation-specific code starting with {@link #RESULT_FIRST_USER}.

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

     *

     * @deprecated From Q, please use the above

     * {@link #onDownloadSubscription(int, DownloadableSubscription, boolean, boolean, Bundle)}.

     * @deprecated From Q, a subclass should use and override the above

     * {@link #onDownloadSubscription(int, DownloadableSubscription, boolean, boolean, Bundle)}. The

     * default return value for this one is Integer.MIN_VALUE.

     */

    @Deprecated public @Result int onDownloadSubscription(int slotId,

            @NonNull DownloadableSubscription subscription, boolean switchAfterDownload,

            boolean forceDeactivateSim) {

        throw new UnsupportedOperationException("onDownloadSubscription(int, "

            + "DownloadableSubscription, boolean, boolean) is deprecated.");

        return Integer.MIN_VALUE;

    }



    /**