diff options
| author | Chen Xu <fionaxu@google.com> | 2022-06-03 17:51:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-03 17:51:09 +0000 |
| commit | cb9e5541daa53d61fa26584acc2e6745edc12968 (patch) | |
| tree | fb2b261e7f3ba74715e3969054004a4ff399001a /src/java/com/android/internal/telephony/uicc | |
| parent | 00ee88d8c220d71aaf9ccfa92542b0b92c2c74a1 (diff) | |
| parent | 8c8d6d8258c8717472e8bfce3b415e0fc4198cbf (diff) | |
| download | telephony-cb9e5541daa53d61fa26584acc2e6745edc12968.tar.gz | |
Merge "Handle NullPointerException during getIccId" into tm-dev am: 03083c8f77 am: 8c8d6d8258
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18672138
Change-Id: I86d6537bbff2349a246cb7bd432fd69965136f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/java/com/android/internal/telephony/uicc')
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccController.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index 23217624eb..86cd278191 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -36,6 +36,7 @@ import android.os.Registrant; import android.os.RegistrantList; import android.preference.PreferenceManager; import android.sysprop.TelephonyProperties; +import android.telephony.AnomalyReporter; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -65,6 +66,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.UUID; import java.util.stream.IntStream; /** @@ -910,8 +912,13 @@ public class UiccController extends Handler { cardId = convertToPublicCardId(eid); } else { // In case of non Euicc, use default port index to get the IccId. - String iccId = card.getUiccPort(TelephonyManager.DEFAULT_PORT_INDEX).getIccId(); - // leave eid null if the UICC is not embedded + UiccPort port = card.getUiccPort(TelephonyManager.DEFAULT_PORT_INDEX); + if (port == null) { + AnomalyReporter.reportAnomaly( + UUID.fromString("92885ba7-98bb-490a-ba19-987b1c8b2055"), + "UiccController: Found UiccPort Null object."); + } + String iccId = (port != null) ? port.getIccId() : null; cardId = convertToPublicCardId(iccId); } } else { |