Merge "Merge "[Telephony] Show 4G icon instead of 3G icon for UMTS network in ATT" into rvc-dev am: 4b5151bb75 am: 7052fa00ca" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-04-17 02:14:49 +00:00
committed by Android (Google) Code Review

View File

@@ -197,8 +197,13 @@ public class MobileSignalController extends SignalController<
TelephonyIcons.THREE_G);
mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_EHRPD),
TelephonyIcons.THREE_G);
mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_UMTS),
if (mConfig.show4gFor3g) {
mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_UMTS),
TelephonyIcons.FOUR_G);
} else {
mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_UMTS),
TelephonyIcons.THREE_G);
}
mNetworkToIconLookup.put(toIconKey(TelephonyManager.NETWORK_TYPE_TD_SCDMA),
TelephonyIcons.THREE_G);