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

Commit 7f69cca1 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

Fix the wrong comparison am: 1bcba3d2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: I226de23b9e147ccf66cbbc57821b8244991f1363
parents b1bd0b6d 1bcba3d2

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -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;

            }

tests/unit/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java

+4 −4
Original line number Diff line number Diff line
@@ -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();