From 0435f0ae61fe55854ccf83a26ced2c587f8923b7 Mon Sep 17 00:00:00 2001
From: changbetty <changbetty@google.com>
Date: Mon, 13 Apr 2020 12:09:43 +0800
Subject: [PATCH] [Telephony] Show 4G icon instead of 3G icon for UMTS network
 in ATT

Bug: 153624066
Test: make
Change-Id: I2eb97a1210c78d08b86f5616a56219ae3f671010
Merged-In: Idc3f0f645a3c2c653061e6dac546f3469b2bc757
---
 .../systemui/statusbar/policy/MobileSignalController.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 8ea09e56164dd..3cb4bec4be660 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) {