PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the wrong comparison am: 1bcba3d23f am: b34e7441b5

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

Change-Id: I795d28464a2aba4b59b1378af0673068bb13d545
This commit is contained in:
SongFerngWang
2021-07-28 17:20:32 +00:00
committed by Automerger Merge Worker
parent 385bbda65e b34e7441b5
commit e68517703c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -348,10 +348,10 @@ public class NetworkSelectSettings extends DashboardFragment {
Class className = cellInfo.getClass(); Class className = cellInfo.getClass();
if (aggregatedList.stream().anyMatch( if (aggregatedList.stream().anyMatch(
i -> { item -> {
return (CellInfoUtil.getNetworkTitle(i.getCellIdentity(), String itemPlmn = CellInfoUtil.getNetworkTitle(item.getCellIdentity(),
CellInfoUtil.getCellIdentityMccMnc(i.getCellIdentity())) == plmn) CellInfoUtil.getCellIdentityMccMnc(item.getCellIdentity()));
&& i.getClass().equals(className); return itemPlmn.equals(plmn) && item.getClass().equals(className);
})) { })) {
continue; continue;
} }

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

@@ -269,8 +269,8 @@ public class NetworkSelectSettingsTest {
private CellInfoLte createLteCellInfo(boolean registered, int cellId, String mcc, String mnc, private CellInfoLte createLteCellInfo(boolean registered, int cellId, String mcc, String mnc,
String plmnName) { String plmnName) {
CellIdentityLte cil = new CellIdentityLte( CellIdentityLte cil = new CellIdentityLte(
cellId, 5, 200, 2000, new int[]{1, 2}, 10000, mcc, cellId, 5, 200, 2000, new int[]{1, 2}, 10000, new String(mcc),
mnc, plmnName, plmnName, new String(mnc), new String(plmnName), new String(plmnName),
Collections.emptyList(), null); Collections.emptyList(), null);
CellSignalStrengthLte cssl = new CellSignalStrengthLte(15, 16, 17, 18, 19, 20); CellSignalStrengthLte cssl = new CellSignalStrengthLte(15, 16, 17, 18, 19, 20);
@@ -284,8 +284,8 @@ public class NetworkSelectSettingsTest {
private CellInfoGsm createGsmCellInfo(boolean registered, int cellId, String mcc, String mnc, private CellInfoGsm createGsmCellInfo(boolean registered, int cellId, String mcc, String mnc,
String plmnName) { String plmnName) {
CellIdentityGsm cig = new CellIdentityGsm(1, cellId, 40, 5, mcc, CellIdentityGsm cig = new CellIdentityGsm(1, cellId, 40, 5, new String(mcc),
mnc, plmnName, plmnName, new String(mnc), new String(plmnName), new String(plmnName),
Collections.emptyList()); Collections.emptyList());
CellSignalStrengthGsm cssg = new CellSignalStrengthGsm(5, 6, 7); CellSignalStrengthGsm cssg = new CellSignalStrengthGsm(5, 6, 7);
CellInfoGsm cellInfoGsm = new CellInfoGsm(); CellInfoGsm cellInfoGsm = new CellInfoGsm();