diff options
| author | Cole Faust <colefaust@google.com> | 2022-08-23 23:05:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-23 23:05:33 +0000 |
| commit | 02130fa03675d27b3be9aae14f4c88b19375fa7a (patch) | |
| tree | 28d2e781f6bd0d344f30ddc66f9ee11165d9dfd4 /src/java/com/android/internal/telephony/uicc | |
| parent | 532825ecd723c49e74ac5cc30bdbb00b1e9ae2fb (diff) | |
| parent | 641816377a6939d1c00b1d448df7737ca25574de (diff) | |
| download | telephony-02130fa03675d27b3be9aae14f4c88b19375fa7a.tar.gz | |
Merge "Fix array-related errorprone warnings" am: 5de75c7d55 am: d90ceacc42 am: b6fbc4e3a1 am: 641816377a
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2185064
Change-Id: I476e1c1566d9cf21c9d3d8e7c0a7d56ac6e50c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/java/com/android/internal/telephony/uicc')
| -rwxr-xr-x | src/java/com/android/internal/telephony/uicc/RuimRecords.java | 4 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/RuimRecords.java b/src/java/com/android/internal/telephony/uicc/RuimRecords.java index f905bdc6ec..08c15735b8 100755 --- a/src/java/com/android/internal/telephony/uicc/RuimRecords.java +++ b/src/java/com/android/internal/telephony/uicc/RuimRecords.java @@ -81,8 +81,8 @@ public class RuimRecords extends IccRecords { + " mMyMobileNumber=" + "xxxx" + " mMin2Min1=" + mMin2Min1 + " mPrlVersion=" + mPrlVersion - + " mEFpl=" + mEFpl - + " mEFli=" + mEFli + + " mEFpl=" + IccUtils.bytesToHexString(mEFpl) + + " mEFli=" + IccUtils.bytesToHexString(mEFli) + " mCsimSpnDisplayCondition=" + mCsimSpnDisplayCondition + " mMdn=" + mMdn + " mMin=" + mMin diff --git a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java index 08521e6d00..7d87e5f1f5 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java +++ b/src/java/com/android/internal/telephony/uicc/UiccCarrierPrivilegeRules.java @@ -495,7 +495,8 @@ public class UiccCarrierPrivilegeRules extends Handler { } } else { if (mAIDInUse == ARAM) { - String errorMsg = "Invalid response: payload=" + response.payload + String errorMsg = "Invalid response: payload=" + + IccUtils.bytesToHexString(response.payload) + " sw1=" + response.sw1 + " sw2=" + response.sw2; updateState(STATE_ERROR, errorMsg); } |