diff options
| author | 2017-09-11 23:14:59 +0000 | |
|---|---|---|
| committer | 2017-09-11 23:14:59 +0000 | |
| commit | ab9cd2868e1f0cb7a2eace7855861c6edfed954d (patch) | |
| tree | a98985bae587e686ab86e6ea8faf32c1fe0690ab | |
| parent | 63c3aa9a4577670962d2191595fb081dbb32b5fc (diff) | |
| parent | 2602e5ff62d11d58b2bd1cb6457c32a5116f9c13 (diff) | |
Merge "Show 3G data icon for TD-SCDMA network type" am: 9da895b5e1
am: 2602e5ff62
Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
2 files changed, 5 insertions, 0 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 b6c76551c48b..b93fb2288e5f 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 fc2d2d5196a2..72707f04f6a1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1667,6 +1667,10 @@ public class TelephonyManager { } } + /* + * 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 */ |