summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2016-07-25 09:46:46 +0200
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-07-27 13:47:47 -0700
commit75915edcfe73c798aae5ca2916a5868d252820b0 (patch)
treef322cdc36bfb03e8724fcf1915b94e36d7620985
parentce2ac523f31010416967545a946df21975d78bfe (diff)
downloadandroid_packages_services_Telephony-75915edcfe73c798aae5ca2916a5868d252820b0.tar.gz
android_packages_services_Telephony-75915edcfe73c798aae5ca2916a5868d252820b0.tar.bz2
android_packages_services_Telephony-75915edcfe73c798aae5ca2916a5868d252820b0.zip
NetworkSelection: Fix double display of radio technology
Some carriers add the technology to their name already so it is not required to add it again by code. Change-Id: Ibfa096cf9b62d9054860d9d76d6e5894c68bbf67
-rw-r--r--src/com/android/phone/NetworkSetting.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 2288f0e25..880180304 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -602,8 +602,16 @@ public class NetworkSetting extends PreferenceActivity
BidiFormatter bidiFormatter = BidiFormatter.getInstance();
title = bidiFormatter.unicodeWrap(ni.getOperatorNumeric(), TextDirectionHeuristics.LTR);
}
- if (!ni.getRadioTech().equals(""))
- title += " " + mRatMap.get(ni.getRadioTech());
+
+ String radioTech = ni.getRadioTech();
+ if (!radioTech.equals("")) {
+ String radioString = mRatMap.get(radioTech);
+
+ // if the carrier already contains the used technology in it's name, don't add it again
+ if (TextUtils.indexOf(title, radioString) < 0) {
+ title += " " + radioString;
+ }
+ }
return title;
}