Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0653f190 authored by Chen Xu's avatar Chen Xu Committed by Automerger Merge Worker
Browse files

Merge "Handle NullPointerException during getIccId" into tm-dev am: 03083c8f... 

Merge "Handle NullPointerException during getIccId" into tm-dev am: 03083c8f am: a28d3a67 am: d0e84608

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18672138



Change-Id: I73ad675ae5a336b264387c94575086dd33bb1b3f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93e95854 d0e84608

src/java/com/android/internal/telephony/uicc/UiccController.java

+9 −2
Original line number Diff line number Diff line
@@ -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 {