From 9fd71f8ec5b72f93df95680b911fb043da03e355 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 13 Apr 2018 19:33:08 -0700 Subject: [PATCH] Fix UiccSlotInfo equals method. In UiccSlotInfo#equals method, it's comparing Strings incorrectly. Bug: 78033760 Test: GTS test Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2 Merged-In: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2 --- telephony/java/android/telephony/UiccSlotInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index 125161d623732..a39992b17f8e5 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -148,7 +148,7 @@ public class UiccSlotInfo implements Parcelable { UiccSlotInfo that = (UiccSlotInfo) obj; return (mIsActive == that.mIsActive) && (mIsEuicc == that.mIsEuicc) - && (mCardId == that.mCardId) + && (Objects.equals(mCardId, that.mCardId)) && (mCardStateInfo == that.mCardStateInfo) && (mLogicalSlotIdx == that.mLogicalSlotIdx) && (mIsExtendedApduSupported == that.mIsExtendedApduSupported);