From 4105ab085600460fc84d8208d5e5326e16bc63b2 Mon Sep 17 00:00:00 2001 From: Wileen Chiu Date: Fri, 18 Sep 2015 15:17:54 -0700 Subject: [PATCH] Show 3G data icon for TD-SCDMA network type - The data annunciator on the UI shows up as "G" instead of "3G" - Map the 3G telephony icon to network type TD-SCDMA Bug: 36802489 Test: manual Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2 --- .../systemui/statusbar/policy/MobileSignalController.java | 1 + telephony/java/android/telephony/TelephonyManager.java | 4 ++++ 2 files changed, 5 insertions(+) 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 efce87177faa8..b21a5e86ee6cd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -182,6 +182,7 @@ public class MobileSignalController extends SignalController< 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); + mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_TD_SCDMA, TelephonyIcons.THREE_G); if (!mConfig.showAtLeast3G) { mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_UNKNOWN, diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4edb069a33094..b7a7d8e3e6396 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1647,6 +1647,10 @@ public class TelephonyManager { return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, ""); } + /* + * When adding a network type to the list below, make sure to add the correct icon to + * MobileSignalController.mapIconSets(). + */ /** Network type is unknown */ public static final int NETWORK_TYPE_UNKNOWN = 0; /** Current network is GPRS */