Skip to content

Commit f379073

Browse files
committed
Show carrier name instead of numeric operator
Thanks to @DerTeufel Change-Id: I2ce4349cecfc2b9eda8acb33aeaafdeb43673cb7
1 parent bb2e27c commit f379073

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

‎packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ public MobileSignalController(Context context, Config config, boolean hasMobileD
9191

9292
String networkName = info.getCarrierName() != null ? info.getCarrierName().toString()
9393
: mNetworkNameDefault;
94+
95+
if (isNumeric(networkName)) {
96+
String displayName = info.getDisplayName() != null? info.getDisplayName().toString()
97+
: mNetworkNameDefault;
98+
networkName = displayName;
99+
}
100+
94101
mLastState.networkName = mCurrentState.networkName = networkName;
95102
mLastState.networkNameData = mCurrentState.networkNameData = networkName;
96103
mLastState.enabled = mCurrentState.enabled = hasMobileData;
@@ -99,6 +106,13 @@ public MobileSignalController(Context context, Config config, boolean hasMobileD
99106
updateDataSim();
100107
}
101108

109+
private boolean isNumeric(String str) {
110+
for (char c : str.toCharArray()) {
111+
if (!Character.isDigit(c)) return false;
112+
}
113+
return true;
114+
}
115+
102116
public void setConfiguration(Config config) {
103117
mConfig = config;
104118
mapIconSets();
@@ -339,10 +353,10 @@ void updateNetworkName(boolean showSpn, String spn, String dataSpn,
339353
StringBuilder str = new StringBuilder();
340354
StringBuilder strData = new StringBuilder();
341355
if (showPlmn && plmn != null) {
342-
str.append(plmn);
356+
if (!isNumeric(plmn)) str.append(plmn);
343357
strData.append(plmn);
344358
}
345-
if (showSpn && spn != null) {
359+
if (/*showSpn &&*/ spn != null) {
346360
if (str.length() != 0) {
347361
str.append(mNetworkNameSeparator);
348362
}

0 commit comments

Comments
 (0)