From 1bcba3d23f7a1a9e24d19f12e417c986b6f2a267 Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Wed, 28 Jul 2021 21:28:18 +0800
Subject: [PATCH] Fix the wrong comparison

Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)

Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
---
 .../settings/network/telephony/NetworkSelectSettings.java | 8 ++++----
 .../network/telephony/NetworkSelectSettingsTest.java      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 62eb690b8d9..813cc745680 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -327,10 +327,10 @@ public class NetworkSelectSettings extends DashboardFragment {
             Class className = cellInfo.getClass();
 
             if (aggregatedList.stream().anyMatch(
-                    i -> {
-                        return (CellInfoUtil.getNetworkTitle(i.getCellIdentity(),
-                                CellInfoUtil.getCellIdentityMccMnc(i.getCellIdentity())) == plmn)
-                                && i.getClass().equals(className);
+                    item -> {
+                        String itemPlmn = CellInfoUtil.getNetworkTitle(item.getCellIdentity(),
+                                CellInfoUtil.getCellIdentityMccMnc(item.getCellIdentity()));
+                        return itemPlmn.equals(plmn) && item.getClass().equals(className);
                     })) {
                 continue;
             }
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
index 769cbca2592..47e3ad903d6 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -169,8 +169,8 @@ public class NetworkSelectSettingsTest {
     private CellInfoLte createLteCellInfo(boolean registered, int cellId, String mcc, String mnc,
             String plmnName) {
         CellIdentityLte cil = new CellIdentityLte(
-                cellId, 5, 200, 2000, new int[]{1, 2}, 10000, mcc,
-                mnc, plmnName, plmnName,
+                cellId, 5, 200, 2000, new int[]{1, 2}, 10000, new String(mcc),
+                new String(mnc), new String(plmnName), new String(plmnName),
                 Collections.emptyList(), null);
         CellSignalStrengthLte cssl = new CellSignalStrengthLte(15, 16, 17, 18, 19, 20);
 
@@ -184,8 +184,8 @@ public class NetworkSelectSettingsTest {
 
     private CellInfoGsm createGsmCellInfo(boolean registered, int cellId, String mcc, String mnc,
             String plmnName) {
-        CellIdentityGsm cig = new CellIdentityGsm(1, cellId, 40, 5, mcc,
-                mnc, plmnName, plmnName,
+        CellIdentityGsm cig = new CellIdentityGsm(1, cellId, 40, 5, new String(mcc),
+                new String(mnc), new String(plmnName), new String(plmnName),
                 Collections.emptyList());
         CellSignalStrengthGsm cssg = new CellSignalStrengthGsm(5, 6, 7);
         CellInfoGsm cellInfoGsm = new CellInfoGsm();