commit fe76f264e4b0eec65917b87a21cbf9d81c2c3603
author Peter Wang <tpwang@google.com> Wed May 13 14:34:48 2020 -0700
committer Peter Wang <tpwang@google.com> Wed May 13 22:50:01 2020 -0700
tree 050a662c831f46c3ac3d4ab9d23a871ddb129fa6
parent ed4731a7d8478fbdbc24b58aa73dac87a5ebc249

Remove unnecessary code and masking

The EXTRA is added in later
addExtrasToResultIntent method

Bug: 155433700
Test: Build
Change-Id: I5e2fee495210fc23d611350aa3c9c5e37e6ba58e

src/java/com/android/internal/telephony/euicc/EuiccController.java

diff --git a/src/java/com/android/internal/telephony/euicc/EuiccController.java b/src/java/com/android/internal/telephony/euicc/EuiccController.java
index a3cae17..c956a88 100644
--- a/src/java/com/android/internal/telephony/euicc/EuiccController.java
+++ b/src/java/com/android/internal/telephony/euicc/EuiccController.java
@@ -401,9 +401,6 @@
                     break;
                 default:
                     resultCode = ERROR;
-                    extrasIntent.putExtra(
-                            EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE,
-                            result.getResult());
                     addExtrasToResultIntent(extrasIntent, result.getResult());
                     break;
             }
@@ -481,20 +478,19 @@
      * b) {@link EuiccManager#EXTRA_EMBEDDED_SUBSCRIPTION_SMDX_REASON_CODE} ->
      * ReasonCode[5.2.6.2] from GSMA (SGP.22 v2.2
      */
-    Intent addExtrasToResultIntent(Intent intent, int resultCode) {
+    private void addExtrasToResultIntent(Intent intent, int resultCode) {
         final int firstByteBitOffset = 24;
         int errorCodeMask = 0xFFFFFF;
-        int operationCodeMask = 0xFF << firstByteBitOffset;
+        int operationCode = resultCode >>> firstByteBitOffset;
 
         intent.putExtra(
                 EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE, resultCode);
 
-        intent.putExtra(EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_OPERATION_CODE,
-                (resultCode & operationCodeMask) >> firstByteBitOffset);
+        intent.putExtra(EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_OPERATION_CODE, operationCode);
 
         // check to see if the operation code is EuiccManager#OPERATION_SMDX_SUBJECT_REASON_CODE
-        final boolean isSmdxSubjectReasonCode = (resultCode >> firstByteBitOffset)
-                == EuiccManager.OPERATION_SMDX_SUBJECT_REASON_CODE;
+        final boolean isSmdxSubjectReasonCode =
+                (operationCode == EuiccManager.OPERATION_SMDX_SUBJECT_REASON_CODE);
 
         if (isSmdxSubjectReasonCode) {
             final Pair<String, String> subjectReasonCode = decodeSmdxSubjectAndReasonCode(
@@ -508,7 +504,6 @@
             final int errorCode = resultCode & errorCodeMask;
             intent.putExtra(EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_ERROR_CODE, errorCode);
         }
-        return intent;
     }
 
     void downloadSubscription(int cardId, DownloadableSubscription subscription,