diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-20 04:45:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-20 04:45:54 +0000 |
| commit | 19227edee1e7472ab3861eeba051cf635741cd09 (patch) | |
| tree | 85f5fb19a258439f24e95a6294072f3ad293f690 | |
| parent | 5f2835ac929cf03672bed8c43dd38bfa3e6f0371 (diff) | |
| parent | c33393c835b811e18cecb3f760e873df342dd8f5 (diff) | |
| download | base-19227edee1e7472ab3861eeba051cf635741cd09.tar.gz | |
Merge cherrypicks of [11161370, 11131606, 11161395, 11161891] into qt-d4-release
Change-Id: Ib2890d0381556e807f379f4a37e4965997312520
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 8ea09e56164d..3cb4bec4be66 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -207,7 +207,13 @@ public class MobileSignalController extends SignalController< mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_EVDO_A, TelephonyIcons.THREE_G); mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_EVDO_B, TelephonyIcons.THREE_G); mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_EHRPD, TelephonyIcons.THREE_G); - mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_UMTS, TelephonyIcons.THREE_G); + if (mConfig.show4gFor3g) { + mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_UMTS, + TelephonyIcons.FOUR_G); + } else { + mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_UMTS, + TelephonyIcons.THREE_G); + } mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_TD_SCDMA, TelephonyIcons.THREE_G); if (!mConfig.showAtLeast3G) { |