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

Commit 1e2806a1 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-5e9ec90cf1ca4a87bec9c6e55c908faf" into rvc-d1-dev-plus-aosp 

* changes:
  Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc828 am: 1fb2e3e4 am: 20faafc4
  [automerger skipped] Rename ErrorCode am: 4888d9ac am: d6e6578a -s ours am: 92b179aa -s ours
  [automerger skipped] Add public error codes to Euicc public API am: e61b636a am: abba583f -s ours am: e6f679e8 -s ours
parents 2f98abeb e8776ae8

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9969,7 +9969,7 @@ package android.service.euicc { 
  public abstract class EuiccService extends android.app.Service {

    ctor public EuiccService();

    method public void dump(@NonNull java.io.PrintWriter);

    method public int encodeSmdxSubjectAndReasonCode(@Nullable String, @Nullable String) throws java.lang.IllegalArgumentException, java.lang.NumberFormatException, java.lang.UnsupportedOperationException;

    method public int encodeSmdxSubjectAndReasonCode(@NonNull String, @NonNull String);

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

    method public abstract int onDeleteSubscription(int, String);

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

telephony/java/android/service/euicc/EuiccService.java

+2 −3
Original line number Diff line number Diff line
@@ -327,9 +327,8 @@ public abstract class EuiccService extends Service { 
     * @throws UnsupportedOperationException when sections has more than four layers (e.g 5.8.1.2)

     *                                       or when an number is bigger than 15

     */

    public int encodeSmdxSubjectAndReasonCode(@Nullable String subjectCode,

            @Nullable String reasonCode)

            throws NumberFormatException, IllegalArgumentException, UnsupportedOperationException {

    public int encodeSmdxSubjectAndReasonCode(@NonNull String subjectCode,

            @NonNull String reasonCode) {

        final int maxSupportedSection = 3;

        final int maxSupportedDigit = 15;

        final int bitsPerSection = 4;