Merge changes from topic "displayinfo" am: cf66c06c32 (d676d83b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+60 −195

Original line number	Diff line number	Diff line
		@@ -15,21 +15,17 @@
		*/
		package com.android.systemui.statusbar.policy;

		import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
		import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS;

		import android.content.Context;
		import android.content.Intent;
		import android.database.ContentObserver;
		import android.net.NetworkCapabilities;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.provider.Settings.Global;
		import android.telephony.Annotation;
		import android.telephony.CellSignalStrength;
		import android.telephony.CellSignalStrengthCdma;
		import android.telephony.NetworkRegistrationInfo;
		import android.telephony.DisplayInfo;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		@@ -58,16 +54,10 @@ import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.regex.Matcher;
		import java.util.regex.Pattern;


		public class MobileSignalController extends SignalController<
		MobileSignalController.MobileState, MobileSignalController.MobileIconGroup> {

		// The message to display Nr5G icon gracfully by CarrierConfig timeout
		private static final int MSG_DISPLAY_GRACE = 1;

		private final TelephonyManager mPhone;
		private final SubscriptionDefaults mDefaults;
		private final String mNetworkNameDefault;
		@@ -84,19 +74,15 @@ public class MobileSignalController extends SignalController<
		// Since some pieces of the phone state are interdependent we store it locally,
		// this could potentially become part of MobileState for simplification/complication
		// of code.
		private int mDataNetType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		private boolean mCA = false;
		private boolean mCAPlus = false;
		private int mDataState = TelephonyManager.DATA_DISCONNECTED;
		private DisplayInfo mDisplayInfo = new DisplayInfo(TelephonyManager.NETWORK_TYPE_UNKNOWN,
		DisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);
		private ServiceState mServiceState;
		private SignalStrength mSignalStrength;
		private MobileIconGroup mDefaultIcons;
		private Config mConfig;
		private final Handler mDisplayGraceHandler;
		@VisibleForTesting
		boolean mInflateSignalStrengths = false;
		@VisibleForTesting
		boolean mIsShowingIconGracefully = false;

		// TODO: Reduce number of vars passed in, if we have the NetworkController, probably don't
		// need listener lists anymore.
		@@ -134,16 +120,6 @@ public class MobileSignalController extends SignalController<
		updateTelephony();
		}
		};

		mDisplayGraceHandler = new Handler(receiverLooper) {
		@Override
		public void handleMessage(Message msg) {
		if (msg.what == MSG_DISPLAY_GRACE) {
		mIsShowingIconGracefully = false;
		updateTelephony();
		}
		}
		};
		}

		public void setConfiguration(Config config) {
		@@ -188,7 +164,8 @@ public class MobileSignalController extends SignalController<
		\| PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
		\| PhoneStateListener.LISTEN_DATA_ACTIVITY
		\| PhoneStateListener.LISTEN_CARRIER_NETWORK_CHANGE
		\| PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE);
		\| PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE
		\| PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
		mContext.getContentResolver().registerContentObserver(Global.getUriFor(Global.MOBILE_DATA),
		true, mObserver);
		mContext.getContentResolver().registerContentObserver(Global.getUriFor(
		@@ -266,50 +243,58 @@ public class MobileSignalController extends SignalController<
		mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.FOUR_G);
		if (mConfig.hideLtePlus) {
		mNetworkToIconLookup.put(toIconKeyCA(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.FOUR_G);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA), TelephonyIcons.FOUR_G);
		} else {
		mNetworkToIconLookup.put(toIconKeyCA(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.FOUR_G_PLUS);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA), TelephonyIcons.FOUR_G_PLUS);
		}
		} else {
		mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.LTE);
		if (mConfig.hideLtePlus) {
		mNetworkToIconLookup.put(toIconKeyCA(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.LTE);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA), TelephonyIcons.LTE);
		} else {
		mNetworkToIconLookup.put(toIconKeyCA(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.LTE_PLUS);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA), TelephonyIcons.LTE_PLUS);
		}
		}
		mNetworkToIconLookup.put(toIconKeyCAPlus(TelephonyManager.NETWORK_TYPE_LTE),
		TelephonyIcons.LTE_CA_5G_E);
		mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_IWLAN),
		TelephonyIcons.WFC);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO), TelephonyIcons.LTE_CA_5G_E);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA), TelephonyIcons.NR_5G);
		mNetworkToIconLookup.put(toDisplayIconKey(
		DisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE), TelephonyIcons.NR_5G_PLUS);
		}

		private String getIconKey() {
		if (mCA) {
		return toIconKeyCA(mDataNetType);
		} else if (mCAPlus) {
		return toIconKeyCAPlus(mDataNetType);
		if (mDisplayInfo.getOverrideNetworkType() == DisplayInfo.OVERRIDE_NETWORK_TYPE_NONE) {
		return toIconKey(mDisplayInfo.getNetworkType());
		} else {
		return toIconKey(mDataNetType);
		return toDisplayIconKey(mDisplayInfo.getOverrideNetworkType());
		}
		}

		// Some specific carriers have 5GE network which is special CA network.
		private String toIconKeyCAPlus(@Annotation.NetworkType int networkType) {
		return toIconKeyCA(networkType) + "_Plus";
		private String toIconKey(@Annotation.NetworkType int networkType) {
		return Integer.toString(networkType);
		}

		private String toIconKeyCA(@Annotation.NetworkType int networkType) {
		return toIconKey(networkType) + "_CA";
		private String toDisplayIconKey(@Annotation.OverrideNetworkType int displayNetworkType) {
		switch (displayNetworkType) {
		case DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_CA:
		return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA";
		case DisplayInfo.OVERRIDE_NETWORK_TYPE_LTE_ADVANCED_PRO:
		return toIconKey(TelephonyManager.NETWORK_TYPE_LTE) + "_CA_Plus";
		case DisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA:
		return "5G";
		case DisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE:
		return "5G_Plus";
		default:
		return "unsupported";
		}

		private String toIconKey(@Annotation.NetworkType int networkType) {
		return Integer.toString(networkType);
		}

		private void updateInflateSignalStrength() {
		@@ -463,26 +448,6 @@ public class MobileSignalController extends SignalController<
		}
		}

		private boolean isCarrierSpecificDataIcon() {
		if (mConfig.patternOfCarrierSpecificDataIcon == null
		\|\| mConfig.patternOfCarrierSpecificDataIcon.length() == 0) {
		return false;
		}

		Pattern stringPattern = Pattern.compile(mConfig.patternOfCarrierSpecificDataIcon);
		String[] operatorNames = new String[]{mServiceState.getOperatorAlphaLongRaw(),
		mServiceState.getOperatorAlphaShortRaw()};
		for (String opName : operatorNames) {
		if (!TextUtils.isEmpty(opName)) {
		Matcher matcher = stringPattern.matcher(opName);
		if (matcher.find()) {
		return true;
		}
		}
		}
		return false;
		}

		/**
		* Updates the network's name based on incoming spn and plmn.
		*/
		@@ -536,18 +501,18 @@ public class MobileSignalController extends SignalController<
		}

		/**
		* Updates the current state based on mServiceState, mSignalStrength, mDataNetType,
		* mDataState, and mSimState. It should be called any time one of these is updated.
		* Updates the current state based on mServiceState, mSignalStrength, mDataState,
		* mDisplayInfo, and mSimState. It should be called any time one of these is updated.
		* This will call listeners if necessary.
		*/
		private final void updateTelephony() {
		if (DEBUG) {
		Log.d(mTag, "updateTelephonySignalStrength: hasService=" +
		Utils.isInService(mServiceState) + " ss=" + mSignalStrength);
		Utils.isInService(mServiceState) + " ss=" + mSignalStrength
		+ " displayInfo=" + mDisplayInfo);
		}
		checkDefaultData();
		mCurrentState.connected = Utils.isInService(mServiceState)
		&& mSignalStrength != null;
		mCurrentState.connected = Utils.isInService(mServiceState) && mSignalStrength != null;
		if (mCurrentState.connected) {
		if (!mSignalStrength.isGsm() && mConfig.alwaysShowCdmaRssi) {
		mCurrentState.level = getCdmaLevel();
		@@ -556,17 +521,8 @@ public class MobileSignalController extends SignalController<
		}
		}

		// When the device is camped on a 5G Non-Standalone network, the data network type is still
		// LTE. In this case, we first check which 5G icon should be shown.
		MobileIconGroup nr5GIconGroup = getNr5GIconGroup();
		if (mConfig.nrIconDisplayGracePeriodMs > 0) {
		nr5GIconGroup = adjustNr5GIconGroupByDisplayGraceTime(nr5GIconGroup);
		}

		String iconKey = getIconKey();
		if (nr5GIconGroup != null) {
		mCurrentState.iconGroup = nr5GIconGroup;
		} else if (mNetworkToIconLookup.get(iconKey) != null) {
		if (mNetworkToIconLookup.get(iconKey) != null) {
		mCurrentState.iconGroup = mNetworkToIconLookup.get(iconKey);
		} else {
		mCurrentState.iconGroup = mDefaultIcons;
		@@ -578,8 +534,7 @@ public class MobileSignalController extends SignalController<
		if (isCarrierNetworkChangeActive()) {
		mCurrentState.iconGroup = TelephonyIcons.CARRIER_NETWORK_CHANGE;
		} else if (isDataDisabled() && !mConfig.alwaysShowDataRatIcon) {
		if (mSubscriptionInfo.getSubscriptionId()
		!= mDefaults.getDefaultDataSubId()) {
		if (mSubscriptionInfo.getSubscriptionId() != mDefaults.getDefaultDataSubId()) {
		mCurrentState.iconGroup = TelephonyIcons.NOT_DEFAULT_DATA;
		} else {
		mCurrentState.iconGroup = TelephonyIcons.DATA_DISABLED;
		@@ -621,82 +576,6 @@ public class MobileSignalController extends SignalController<
		notifyListenersIfNecessary();
		}

		private MobileIconGroup getNr5GIconGroup() {
		if (mServiceState == null) return null;

		int nrState = mServiceState.getNrState();
		if (nrState == NetworkRegistrationInfo.NR_STATE_CONNECTED) {
		// Check if the NR 5G is using millimeter wave and the icon is config.
		if (mServiceState.getNrFrequencyRange() == ServiceState.FREQUENCY_RANGE_MMWAVE) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_CONNECTED_MMWAVE)) {
		return mConfig.nr5GIconMap.get(Config.NR_CONNECTED_MMWAVE);
		}
		}

		// If NR 5G is not using millimeter wave or there is no icon for millimeter wave, we
		// check the normal 5G icon.
		if (mConfig.nr5GIconMap.containsKey(Config.NR_CONNECTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_CONNECTED);
		}
		} else if (nrState == NetworkRegistrationInfo.NR_STATE_NOT_RESTRICTED) {
		if (mCurrentState.activityDormant) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_NOT_RESTRICTED_RRC_IDLE)) {
		return mConfig.nr5GIconMap.get(Config.NR_NOT_RESTRICTED_RRC_IDLE);
		}
		} else {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_NOT_RESTRICTED_RRC_CON)) {
		return mConfig.nr5GIconMap.get(Config.NR_NOT_RESTRICTED_RRC_CON);
		}
		}
		} else if (nrState == NetworkRegistrationInfo.NR_STATE_RESTRICTED) {
		if (mConfig.nr5GIconMap.containsKey(Config.NR_RESTRICTED)) {
		return mConfig.nr5GIconMap.get(Config.NR_RESTRICTED);
		}
		}

		return null;
		}

		/**
		* The function to adjust MobileIconGroup depend on CarrierConfig's time
		* nextIconGroup == null imply next state could be 2G/3G/4G/4G+
		* nextIconGroup != null imply next state will be 5G/5G+
		* Flag : mIsShowingIconGracefully
		* ---------------------------------------------------------------------------------
		* \| Last state \| Current state \| Flag \| Action \|
		* ---------------------------------------------------------------------------------
		* \| 5G/5G+ \| 2G/3G/4G/4G+ \| true \| return previous IconGroup \|
		* \| 5G/5G+ \| 5G/5G+ \| true \| Bypass \|
		* \| 2G/3G/4G/4G+ \| 5G/5G+ \| true \| Bypass \|
		* \| 2G/3G/4G/4G+ \| 2G/3G/4G/4G+ \| true \| Bypass \|
		* \| SS.connected \| SS.disconnect \| T\|F \| Reset timer \|
		* \|NETWORK_TYPE_LTE\|!NETWORK_TYPE_LTE\| T\|F \| Reset timer \|
		* \| 5G/5G+ \| 2G/3G/4G/4G+ \| false\| Bypass \|
		* \| 5G/5G+ \| 5G/5G+ \| false\| Bypass \|
		* \| 2G/3G/4G/4G+ \| 5G/5G+ \| false\| SendMessageDelay(time), flag->true \|
		* \| 2G/3G/4G/4G+ \| 2G/3G/4G/4G+ \| false\| Bypass \|
		* ---------------------------------------------------------------------------------
		*/
		private MobileIconGroup adjustNr5GIconGroupByDisplayGraceTime(
		MobileIconGroup candidateIconGroup) {
		if (mIsShowingIconGracefully && candidateIconGroup == null) {
		candidateIconGroup = (MobileIconGroup) mCurrentState.iconGroup;
		} else if (!mIsShowingIconGracefully && candidateIconGroup != null
		&& mLastState.iconGroup != candidateIconGroup) {
		mDisplayGraceHandler.sendMessageDelayed(
		mDisplayGraceHandler.obtainMessage(MSG_DISPLAY_GRACE),
		mConfig.nrIconDisplayGracePeriodMs);
		mIsShowingIconGracefully = true;
		} else if (!mCurrentState.connected \|\| mDataState == TelephonyManager.DATA_DISCONNECTED
		\|\| candidateIconGroup == null) {
		mDisplayGraceHandler.removeMessages(MSG_DISPLAY_GRACE);
		mIsShowingIconGracefully = false;
		candidateIconGroup = null;
		}

		return candidateIconGroup;
		}

		boolean isDataDisabled() {
		return !mPhone.isDataConnectionEnabled();
		}
		@@ -707,8 +586,6 @@ public class MobileSignalController extends SignalController<
		\|\| activity == TelephonyManager.DATA_ACTIVITY_IN;
		mCurrentState.activityOut = activity == TelephonyManager.DATA_ACTIVITY_INOUT
		\|\| activity == TelephonyManager.DATA_ACTIVITY_OUT;
		mCurrentState.activityDormant = activity == TelephonyManager.DATA_ACTIVITY_DORMANT;

		notifyListenersIfNecessary();
		}

		@@ -718,13 +595,10 @@ public class MobileSignalController extends SignalController<
		pw.println(" mSubscription=" + mSubscriptionInfo + ",");
		pw.println(" mServiceState=" + mServiceState + ",");
		pw.println(" mSignalStrength=" + mSignalStrength + ",");
		pw.println(" mDisplayInfo=" + mDisplayInfo + ",");
		pw.println(" mDataState=" + mDataState + ",");
		pw.println(" mDataNetType=" + mDataNetType + ",");
		pw.println(" mCA=" + mCA + ",");
		pw.println(" mCAPlus=" + mCAPlus + ",");
		pw.println(" mInflateSignalStrengths=" + mInflateSignalStrengths + ",");
		pw.println(" isDataDisabled=" + isDataDisabled() + ",");
		pw.println(" mIsShowingIconGracefully=" + mIsShowingIconGracefully + ",");
		}

		class MobilePhoneStateListener extends PhoneStateListener {
		@@ -749,14 +623,8 @@ public class MobileSignalController extends SignalController<
		+ " dataState=" + state.getDataRegistrationState());
		}
		mServiceState = state;
		if (mServiceState != null) {
		NetworkRegistrationInfo regInfo = mServiceState.getNetworkRegistrationInfo(
		DOMAIN_PS, TRANSPORT_TYPE_WWAN);
		if (regInfo != null) {
		updateDataNetType(regInfo.getAccessNetworkTechnology());
		}
		}
		updateTelephony();
		// onDisplayInfoChanged is invoked directly after onServiceStateChanged, so not calling
		// updateTelephony() to prevent icon flickering in case of overrides.
		}

		@Override
		@@ -766,21 +634,10 @@ public class MobileSignalController extends SignalController<
		+ " type=" + networkType);
		}
		mDataState = state;
		updateDataNetType(networkType);
		updateTelephony();
		}

		private void updateDataNetType(int networkType) {
		mDataNetType = networkType;
		mCA = false;
		mCAPlus = false;
		if (mDataNetType == TelephonyManager.NETWORK_TYPE_LTE) {
		if (isCarrierSpecificDataIcon()) {
		mCAPlus = true;
		} else if (mServiceState != null && mServiceState.isUsingCarrierAggregation()) {
		mCA = true;
		}
		if (networkType != mDisplayInfo.getNetworkType()) {
		mDisplayInfo = new DisplayInfo(networkType, DisplayInfo.OVERRIDE_NETWORK_TYPE_NONE);
		}
		updateTelephony();
		}

		@Override
		@@ -797,7 +654,6 @@ public class MobileSignalController extends SignalController<
		Log.d(mTag, "onCarrierNetworkChange: active=" + active);
		}
		mCurrentState.carrierNetworkChangeMode = active;

		updateTelephony();
		}

		@@ -807,7 +663,16 @@ public class MobileSignalController extends SignalController<
		updateDataSim();
		updateTelephony();
		}
		};

		@Override
		public void onDisplayInfoChanged(DisplayInfo displayInfo) {
		if (DEBUG) {
		Log.d(mTag, "onDisplayInfoChanged: displayInfo=" + displayInfo);
		}
		mDisplayInfo = displayInfo;
		updateTelephony();
		}
		}

		static class MobileIconGroup extends SignalController.IconGroup {
		final int mDataContentDescription; // mContentDescriptionDataType

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+0 −89

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ import android.telephony.SubscriptionManager;
		import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.text.format.DateUtils;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.SparseArray;
		@@ -67,7 +66,6 @@ import com.android.systemui.Dumpable;
		import com.android.systemui.R;
		import com.android.systemui.settings.CurrentUserTracker;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
		import com.android.systemui.statusbar.policy.MobileSignalController.MobileIconGroup;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -75,10 +73,8 @@ import java.util.ArrayList;
		import java.util.BitSet;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;

		import javax.inject.Inject;
		import javax.inject.Named;
		@@ -848,12 +844,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
		pw.println(emergencyToString(mEmergencySource));

		pw.println(" - config ------");
		pw.print(" patternOfCarrierSpecificDataIcon=");
		pw.println(mConfig.patternOfCarrierSpecificDataIcon);
		pw.print(" nr5GIconMap=");
		pw.println(mConfig.nr5GIconMap.toString());
		pw.print(" nrIconDisplayGracePeriodMs=");
		pw.println(mConfig.nrIconDisplayGracePeriodMs);
		for (int i = 0; i < mMobileSignalControllers.size(); i++) {
		MobileSignalController mobileSignalController = mMobileSignalControllers.valueAt(i);
		mobileSignalController.dump(pw);
		@@ -1134,14 +1124,6 @@ public class NetworkControllerImpl extends BroadcastReceiver

		@VisibleForTesting
		static class Config {
		static final int NR_CONNECTED_MMWAVE = 1;
		static final int NR_CONNECTED = 2;
		static final int NR_NOT_RESTRICTED_RRC_IDLE = 3;
		static final int NR_NOT_RESTRICTED_RRC_CON = 4;
		static final int NR_RESTRICTED = 5;

		Map<Integer, MobileIconGroup> nr5GIconMap = new HashMap<>();

		boolean showAtLeast3G = false;
		boolean show4gFor3g = false;
		boolean alwaysShowCdmaRssi = false;
		@@ -1150,22 +1132,6 @@ public class NetworkControllerImpl extends BroadcastReceiver
		boolean hspaDataDistinguishable;
		boolean inflateSignalStrengths = false;
		boolean alwaysShowDataRatIcon = false;
		public String patternOfCarrierSpecificDataIcon = "";
		public long nrIconDisplayGracePeriodMs;

		/**
		* Mapping from NR 5G status string to an integer. The NR 5G status string should match
		* those in carrier config.
		*/
		private static final Map<String, Integer> NR_STATUS_STRING_TO_INDEX;
		static {
		NR_STATUS_STRING_TO_INDEX = new HashMap<>(5);
		NR_STATUS_STRING_TO_INDEX.put("connected_mmwave", NR_CONNECTED_MMWAVE);
		NR_STATUS_STRING_TO_INDEX.put("connected", NR_CONNECTED);
		NR_STATUS_STRING_TO_INDEX.put("not_restricted_rrc_idle", NR_NOT_RESTRICTED_RRC_IDLE);
		NR_STATUS_STRING_TO_INDEX.put("not_restricted_rrc_con", NR_NOT_RESTRICTED_RRC_CON);
		NR_STATUS_STRING_TO_INDEX.put("restricted", NR_RESTRICTED);
		}

		static Config readConfig(Context context) {
		Config config = new Config();
		@@ -1194,64 +1160,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
		CarrierConfigManager.KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL);
		config.hideLtePlus = b.getBoolean(
		CarrierConfigManager.KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL);
		config.patternOfCarrierSpecificDataIcon = b.getString(
		CarrierConfigManager.KEY_SHOW_CARRIER_DATA_ICON_PATTERN_STRING);
		String nr5GIconConfiguration =
		b.getString(CarrierConfigManager.KEY_5G_ICON_CONFIGURATION_STRING);
		if (!TextUtils.isEmpty(nr5GIconConfiguration)) {
		String[] nr5GIconConfigPairs = nr5GIconConfiguration.trim().split(",");
		for (String pair : nr5GIconConfigPairs) {
		add5GIconMapping(pair, config);
		}
		}
		setDisplayGraceTime(
		b.getInt(CarrierConfigManager.KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT),
		config);
		}

		return config;
		}

		/**
		* Add a mapping from NR 5G status to the 5G icon. All the icon resources come from
		* {@link TelephonyIcons}.
		*
		* @param keyValuePair the NR 5G status and icon name separated by a colon.
		* @param config container that used to store the parsed configs.
		*/
		@VisibleForTesting
		static void add5GIconMapping(String keyValuePair, Config config) {
		String[] kv = (keyValuePair.trim().toLowerCase()).split(":");

		if (kv.length != 2) {
		if (DEBUG) Log.e(TAG, "Invalid 5G icon configuration, config = " + keyValuePair);
		return;
		}

		String key = kv[0], value = kv[1];

		// There is no icon config for the specific 5G status.
		if (value.equals("none")) return;

		if (NR_STATUS_STRING_TO_INDEX.containsKey(key)
		&& TelephonyIcons.ICON_NAME_TO_ICON.containsKey(value)) {
		config.nr5GIconMap.put(
		NR_STATUS_STRING_TO_INDEX.get(key),
		TelephonyIcons.ICON_NAME_TO_ICON.get(value));
		}
		}

		/**
		* Set display gracefully period time(MS) depend on carrierConfig KEY
		* KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, and this function will convert to ms.
		* {@link CarrierConfigManager}.
		*
		* @param time showing 5G icon gracefully in the period of the time(SECOND)
		* @param config container that used to store the parsed configs.
		*/
		@VisibleForTesting
		static void setDisplayGraceTime(int time, Config config) {
		config.nrIconDisplayGracePeriodMs = time * DateUtils.SECOND_IN_MILLIS;
		}
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java

+0 −4

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+5 −27

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

+1 −261

File changed.

Preview size limit exceeded, changes collapsed.