Merge changes from topic "Add5GEvolutionIcon_AOSP" (34fbf655) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+30 −1

Original line number	Diff line number	Diff line
		@@ -2078,7 +2078,8 @@ public class GsmCdmaPhone extends Phone {
		@Override
		public void getAvailableNetworks(Message response) {
		if (isPhoneTypeGsm() \|\| isPhoneTypeCdmaLte()) {
		mCi.getAvailableNetworks(response);
		Message msg = obtainMessage(EVENT_GET_AVAILABLE_NETWORKS_DONE, response);
		mCi.getAvailableNetworks(msg);
		} else {
		loge("getAvailableNetworks: not possible in CDMA");
		}
		@@ -2738,6 +2739,34 @@ public class GsmCdmaPhone extends Phone {
		case EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE:
		mDataEnabledSettings.updateProvisioningDataEnabled();
		break;
		case EVENT_GET_AVAILABLE_NETWORKS_DONE:
		ar = (AsyncResult) msg.obj;
		if (ar.exception == null && ar.result != null && mSST != null) {
		List<OperatorInfo> operatorInfoList = (List<OperatorInfo>) ar.result;
		List<OperatorInfo> filteredInfoList = new ArrayList<>();
		for (OperatorInfo operatorInfo : operatorInfoList) {
		if (OperatorInfo.State.CURRENT == operatorInfo.getState()) {
		filteredInfoList.add(new OperatorInfo(
		mSST.filterOperatorNameByPattern(
		operatorInfo.getOperatorAlphaLong()),
		mSST.filterOperatorNameByPattern(
		operatorInfo.getOperatorAlphaShort()),
		operatorInfo.getOperatorNumeric(),
		operatorInfo.getState()
		));
		} else {
		filteredInfoList.add(operatorInfo);
		}
		}
		ar.result = filteredInfoList;
		}

		onComplete = (Message) ar.userObj;
		if (onComplete != null) {
		AsyncResult.forMessage(onComplete, ar.result, ar.exception);
		onComplete.sendToTarget();
		}
		break;
		default:
		super.handleMessage(msg);
		}

src/java/com/android/internal/telephony/NetworkScanRequestTracker.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -437,6 +437,11 @@ public final class NetworkScanRequestTracker {
		? TelephonyScanManager.CALLBACK_SCAN_RESULTS
		: TelephonyScanManager.CALLBACK_RESTRICTED_SCAN_RESULTS;
		if (nsr.scanError == NetworkScan.SUCCESS) {
		if (nsri.mPhone.getServiceStateTracker() != null) {
		nsri.mPhone.getServiceStateTracker().updateOperatorNameForCellInfo(
		nsr.networkInfos);
		}

		notifyMessenger(nsri, notifyMsg,
		rilErrorToScanError(nsr.scanError), nsr.networkInfos);
		if (nsr.scanStatus == NetworkScanResult.SCAN_STATUS_COMPLETE) {

src/java/com/android/internal/telephony/Phone.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -222,8 +222,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		protected static final int EVENT_SET_CARRIER_DATA_ENABLED = 48;
		protected static final int EVENT_DEVICE_PROVISIONED_CHANGE = 49;
		protected static final int EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE = 50;
		protected static final int EVENT_GET_AVAILABLE_NETWORKS_DONE = 51;

		protected static final int EVENT_LAST = EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE;
		protected static final int EVENT_LAST = EVENT_GET_AVAILABLE_NETWORKS_DONE;

		// For shared prefs.
		private static final String GSM_ROAMING_LIST_OVERRIDE_PREFIX = "gsm_roaming_list_";

src/java/com/android/internal/telephony/ServiceStateTracker.java

+89 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,8 @@ import java.util.List;
		import java.util.Objects;
		import java.util.TimeZone;
		import java.util.concurrent.atomic.AtomicInteger;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;
		import java.util.regex.PatternSyntaxException;

		/**
		@@ -340,6 +342,8 @@ public class ServiceStateTracker extends Handler {
		private final LocalLog mRadioPowerLog = new LocalLog(20);
		private final LocalLog mMdnLog = new LocalLog(20);

		private Pattern mOperatorNameStringPattern;

		private class SstSubscriptionsChangedListener extends OnSubscriptionsChangedListener {
		public final AtomicInteger mPreviousSubId =
		new AtomicInteger(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		@@ -1094,6 +1098,7 @@ public class ServiceStateTracker extends Handler {
		loge("Invalid CellInfo result");
		} else {
		cellInfo = (List<CellInfo>) ar.result;
		updateOperatorNameForCellInfo(cellInfo);
		mLastCellInfoList = cellInfo;
		mPhone.notifyCellInfo(cellInfo);
		if (VDBG) {
		@@ -1206,6 +1211,7 @@ public class ServiceStateTracker extends Handler {
		if (ar.exception == null) {
		CellIdentity cellIdentity = ((NetworkRegistrationInfo) ar.result)
		.getCellIdentity();
		updateOperatorNameForCellIdentity(cellIdentity);
		mCellIdentity = cellIdentity;
		mPhone.notifyLocationChanged(getCellLocation());
		}
		@@ -1792,6 +1798,7 @@ public class ServiceStateTracker extends Handler {
		if (mPollingContext[0] == 0) {
		mNewSS.setEmergencyOnly(mEmergencyOnly);
		combinePsRegistrationStates(mNewSS);
		updateOperatorNameForServiceState(mNewSS);
		if (mPhone.isPhoneTypeGsm()) {
		updateRoamingState();
		} else {
		@@ -2172,6 +2179,8 @@ public class ServiceStateTracker extends Handler {
		String opNames[] = (String[]) ar.result;

		if (opNames != null && opNames.length >= 3) {
		mNewSS.setOperatorAlphaLongRaw(opNames[0]);
		mNewSS.setOperatorAlphaShortRaw(opNames[1]);
		// FIXME: Giving brandOverride higher precedence, is this desired?
		String brandOverride = mUiccController.getUiccCard(getPhoneId()) != null
		? mUiccController.getUiccCard(getPhoneId())
		@@ -4580,6 +4589,7 @@ public class ServiceStateTracker extends Handler {
		if (config != null) {
		updateLteEarfcnLists(config);
		updateReportingCriteria(config);
		updateOperatorNamePattern(config);
		}

		// Sometimes the network registration information comes before carrier config is ready.
		@@ -5304,4 +5314,83 @@ public class ServiceStateTracker extends Handler {
		String getCdmaEriText(int roamInd, int defRoamInd) {
		return mEriManager.getCdmaEriText(roamInd, defRoamInd);
		}

		private void updateOperatorNamePattern(PersistableBundle config) {
		String operatorNamePattern = config.getString(
		CarrierConfigManager.KEY_OPERATOR_NAME_FILTER_PATTERN_STRING);
		if (!TextUtils.isEmpty(operatorNamePattern)) {
		mOperatorNameStringPattern = Pattern.compile(operatorNamePattern);
		if (DBG) {
		log("mOperatorNameStringPattern: " + mOperatorNameStringPattern.toString());
		}
		}
		}

		private void updateOperatorNameForServiceState(ServiceState servicestate) {
		if (servicestate == null) {
		return;
		}

		servicestate.setOperatorName(
		filterOperatorNameByPattern(servicestate.getOperatorAlphaLong()),
		filterOperatorNameByPattern(servicestate.getOperatorAlphaShort()),
		servicestate.getOperatorNumeric());

		List<NetworkRegistrationInfo> networkRegistrationInfos =
		servicestate.getNetworkRegistrationInfoList();

		for (int i = 0; i < networkRegistrationInfos.size(); i++) {
		if (networkRegistrationInfos.get(i) != null) {
		updateOperatorNameForCellIdentity(
		networkRegistrationInfos.get(i).getCellIdentity());
		}
		}
		}

		private void updateOperatorNameForCellIdentity(CellIdentity cellIdentity) {
		if (cellIdentity == null) {
		return;
		}
		cellIdentity.setOperatorAlphaLong(
		filterOperatorNameByPattern((String) cellIdentity.getOperatorAlphaLong()));
		cellIdentity.setOperatorAlphaShort(
		filterOperatorNameByPattern((String) cellIdentity.getOperatorAlphaShort()));
		}

		/**
		* To modify the operator name of CellInfo by pattern.
		*
		* @param cellInfos List of CellInfo{@link CellInfo}.
		*/
		public void updateOperatorNameForCellInfo(List<CellInfo> cellInfos) {
		if (cellInfos == null \|\| cellInfos.isEmpty()) {
		return;
		}
		for (CellInfo cellInfo : cellInfos) {
		if (cellInfo.isRegistered()) {
		updateOperatorNameForCellIdentity(cellInfo.getCellIdentity());
		}
		}
		}

		/**
		* To modify the operator name by pattern.
		*
		* @param operatorName Registered operator name
		* @return An operator name.
		*/
		public String filterOperatorNameByPattern(String operatorName) {
		if (mOperatorNameStringPattern == null \|\| TextUtils.isEmpty(operatorName)) {
		return operatorName;
		}
		Matcher matcher = mOperatorNameStringPattern.matcher(operatorName);
		if (matcher.find()) {
		if (matcher.groupCount() > 0) {
		operatorName = matcher.group(1);
		} else {
		log("filterOperatorNameByPattern: pattern no group");
		}
		}
		return operatorName;
		}
		}