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

Commit 25d31d81 authored May 11, 2022 by Muralidhar Reddy Mule Committed by Automerger Merge Worker May 11, 2022

Merge "[MEP] Handle java.lang.NullPointerException" into tm-dev am: af901105

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

Change-Id: I99d6cc3fcb599e681b5f8715c2ba3faaa6fcfa43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 3a6cf2de af901105

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1053,7 +1053,9 @@ public class EuiccConnector extends StateMachine implements ServiceConnection {
		}
		String cardIdString = UiccController.getInstance().convertToCardString(cardId);
		for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {
		if (IccUtils.compareIgnoreTrailingFs(cardIdString, slotInfos[slotIndex].getCardId())) {
		String retrievedCardId = slotInfos[slotIndex] != null
		? slotInfos[slotIndex].getCardId() : null;
		if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {
		return slotIndex;
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -1307,7 +1307,9 @@ public class EuiccController extends IEuiccController.Stub {
		}
		String cardIdString = UiccController.getInstance().convertToCardString(cardId);
		for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {
		if (IccUtils.compareIgnoreTrailingFs(cardIdString, slotInfos[slotIndex].getCardId())) {
		String retrievedCardId = slotInfos[slotIndex] != null
		? slotInfos[slotIndex].getCardId() : null;
		if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {
		return slotIndex;
		}
		}