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

Mainline: removed legacy UI for network selection mode.

Browse Source 
Framework does not support getAvailableNetworks(), so legacy
UI does not work. Removed legacy UI for network selection mode.

Bug: 147404387
Test: 1.make RunSettingsRoboTests ROBOTEST_FILTER=\
NetworkScanHelperTest(PASS)
2.make RunSettingsRoboTests \
ROBOTEST_FILTER=NetworkSelectSettingsTest(PASS)
Change-Id: I421526e844100b08e0c39e6e993ca09d1fad8457
This commit is contained in:
SongFerngWang
2020-01-09 15:00:45 +08:00
parent 8b1b697711
commit 521ebeafd3
6 changed files with 30 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/network/telephony/CellInfoUtil.java
View File

@@ -33,8 +33,6 @@ import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import com.android.internal.telephony.OperatorInfo;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -101,34 +99,6 @@ public final class CellInfoUtil {
return cellId;
}
/**
* Creates a CellInfo object from OperatorInfo. GsmCellInfo is used here only because
* operatorInfo does not contain technology type while CellInfo is an abstract object that
* requires to specify technology type. It doesn't matter which CellInfo type to use here, since
* we only want to wrap the operator info and PLMN to a CellInfo object.
*/
public static CellInfo convertOperatorInfoToCellInfo(OperatorInfo operatorInfo) {
final String operatorNumeric = operatorInfo.getOperatorNumeric();
String mcc = null;
String mnc = null;
if (operatorNumeric != null && operatorNumeric.matches("^[0-9]{5,6}$")) {
mcc = operatorNumeric.substring(0, 3);
mnc = operatorNumeric.substring(3);
}
final CellIdentityGsm cig = new CellIdentityGsm(
Integer.MAX_VALUE /* lac */,
Integer.MAX_VALUE /* cid */,
Integer.MAX_VALUE /* arfcn */,
Integer.MAX_VALUE /* bsic */,
mcc,
mnc,
operatorInfo.getOperatorAlphaLong(),
operatorInfo.getOperatorAlphaShort());
final CellInfoGsm ci = new CellInfoGsm();
ci.setCellIdentity(cig);
return ci;
}
/** Convert a list of cellInfos to readable string without sensitive info. */
public static String cellInfoListToString(List<CellInfo> cellInfos) {