commit 5ea8ba5c0c06d0fd7a70f649f879f1f26bd403ef
author Malcolm Chen <refuhoo@google.com> Fri Apr 13 19:33:08 2018 -0700
committer Malcolm Chen <refuhoo@google.com> Mon Apr 16 12:50:13 2018 -0700
tree 2a0c26598be9b5119807eb101ae0d1ea7ea65296
parent 8ecf40491be046f0cbd534c9b9fbc5d270f24b02

Fix UiccSlotInfo equals method.

In UiccSlotInfo#equals method, it's comparing Strings incorrectly.

Bug: 78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2

telephony/java/android/telephony/UiccSlotInfo.java

diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java
index 125161d..a39992b 100644
--- a/telephony/java/android/telephony/UiccSlotInfo.java
+++ b/telephony/java/android/telephony/UiccSlotInfo.java
@@ -148,7 +148,7 @@
         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);