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

Fix the wrong comparison am: 1bcba3d23f

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

Change-Id: If39ce68a76790912d69dfce084bbf8b9421f8ec0
This commit is contained in:
SongFerngWang
2021-07-28 17:03:56 +00:00
committed by Automerger Merge Worker
parent 046c8d4a97 1bcba3d23f
commit 9d9d06ab24
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

@@ -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;
}

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

@@ -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();