Update EuiccService encodeSmdxSubjectAndReasonCode

Update the method signature of encoding subject code and reasoncode
Bug: 149216056
Test: atest EuiccService

Change-Id: Ifb9c1a11f48e191f7d49384946f9fd78d81b84dc
Merged-In: Ifb9c1a11f48e191f7d49384946f9fd78d81b84dc

2 files changed, 3 insertions, 4 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index 4072309a4013..8b44775d2162 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7500,7 +7500,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;