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

Commit e5e1392e authored by Aman Gupta's avatar Aman Gupta Committed by Android (Google) Code Review
Browse files

Merge "Adding Anomaly Reporting on UiccSlotInfo null object." into tm-dev

parents e9d860df e169a9b2

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

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.service.euicc.IOtaStatusChangedCallback; 
import android.service.euicc.IRetainSubscriptionsForFactoryResetCallback;

import android.service.euicc.ISwitchToSubscriptionCallback;

import android.service.euicc.IUpdateSubscriptionNicknameCallback;

import android.telephony.AnomalyReporter;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.UiccCardInfo;
@@ -83,6 +84,7 @@ import java.io.PrintWriter; 
import java.util.List;

import java.util.Objects;

import java.util.Set;

import java.util.UUID;



/**

 * State machine which maintains the binding to the EuiccService implementation and issues commands.
@@ -1053,6 +1055,12 @@ public class EuiccConnector extends StateMachine implements ServiceConnection { 
        }

        String cardIdString = UiccController.getInstance().convertToCardString(cardId);

        for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {

            // Report Anomaly in case UiccSlotInfo is not.

            if (slotInfos[slotIndex] == null) {

                AnomalyReporter.reportAnomaly(

                        UUID.fromString("4195b83d-6cee-4999-a02f-d0b9f7079b9d"),

                        "EuiccConnector: Found UiccSlotInfo Null object.");

            }

            String retrievedCardId = slotInfos[slotIndex] != null

                    ? slotInfos[slotIndex].getCardId() : null;

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {

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

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.service.euicc.EuiccService; 
import android.service.euicc.GetDefaultDownloadableSubscriptionListResult;

import android.service.euicc.GetDownloadableSubscriptionMetadataResult;

import android.service.euicc.GetEuiccProfileInfoListResult;

import android.telephony.AnomalyReporter;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyFrameworkInitializer;
@@ -70,6 +71,7 @@ import java.io.PrintWriter; 
import java.util.Collections;

import java.util.List;

import java.util.Stack;

import java.util.UUID;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicReference;
@@ -1310,6 +1312,11 @@ public class EuiccController extends IEuiccController.Stub { 
        }

        String cardIdString = UiccController.getInstance().convertToCardString(cardId);

        for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {

            if (slotInfos[slotIndex] == null) {

                AnomalyReporter.reportAnomaly(

                        UUID.fromString("e9517acf-e1a1-455f-9231-1b5515a0d0eb"),

                        "EuiccController: Found UiccSlotInfo Null object.");

            }

            String retrievedCardId = slotInfos[slotIndex] != null

                    ? slotInfos[slotIndex].getCardId() : null;

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {