Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use TelephonyManager#getSimOperatorName for Carrier WiFi" into sc-dev

Browse Source
This commit is contained in:
Ying Xu
2021-02-08 20:41:54 +00:00
committed by Android (Google) Code Review
parent 24f9bc68da 4c478ca37f
commit 78fed176c8
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
View File

@@ -357,16 +357,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
return Utils.isInService(mServiceState);
}
String getNonDefaultCarrierName() {
if (!mCurrentState.networkNameData.equals(mNetworkNameDefault)) {
return mCurrentState.networkNameData;
} else if (mSubscriptionInfo.getCarrierName() != null) {
return mSubscriptionInfo.getCarrierName().toString();
} else if (mSubscriptionInfo.getDisplayName() != null) {
return mSubscriptionInfo.getDisplayName().toString();
} else {
return "";
}
String getNetworkNameForCarrierWiFi() {
return mPhone.getSimOperatorName();
}
private boolean isRoaming() {

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -549,9 +549,9 @@ public class NetworkControllerImpl extends BroadcastReceiver
return mConnectedTransports.get(NetworkCapabilities.TRANSPORT_ETHERNET);
}
String getNonDefaultMobileDataNetworkName(int subId) {
String getNetworkNameForCarrierWiFi(int subId) {
MobileSignalController controller = getControllerWithSubId(subId);
return controller != null ? controller.getNonDefaultCarrierName() : "";
return controller != null ? controller.getNetworkNameForCarrierWiFi() : "";
}
private void notifyControllersMobileDataChanged() {

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
View File

@@ -147,7 +147,7 @@ public class WifiSignalController extends
IconState qsIcon = new IconState(
mCurrentState.connected, getQsCurrentIconIdForCarrierWifi(), contentDescription);
CharSequence description =
mNetworkController.getNonDefaultMobileDataNetworkName(mCurrentState.subId);
mNetworkController.getNetworkNameForCarrierWiFi(mCurrentState.subId);
callback.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon,
mCurrentState.activityIn, mCurrentState.activityOut, dataContentDescription,
dataContentDescriptionHtml, description, icons.isWide,