diff options
| author | Alex Lin <wwl@google.com> | 2020-03-17 23:43:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-17 23:43:27 +0000 |
| commit | 20faafc483b5f7995a09098da3a875eb9ab3b102 (patch) | |
| tree | c7bfd413629c6151574930ce4f1233993b8e7fcb | |
| parent | 92b179aa9122f360d3b85444f451d16d9c752d8e (diff) | |
| parent | 1fb2e3e4fc7a7df61f87aefc39094bd453752427 (diff) | |
Update EuiccService encodeSmdxSubjectAndReasonCode am: 2c3cc82819 am: 1fb2e3e4fc
Change-Id: I54d7779e0def1eda1b96edb2ae07d4f131e10871
| -rwxr-xr-x | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/service/euicc/EuiccService.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index c7eb6011e41f..a3163531521b 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/telephony/java/android/service/euicc/EuiccService.java b/telephony/java/android/service/euicc/EuiccService.java index 93155865c166..ae2652e6c229 100644 --- a/telephony/java/android/service/euicc/EuiccService.java +++ b/telephony/java/android/service/euicc/EuiccService.java @@ -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; |