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

am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev

Browse Source 
* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController
This commit is contained in:
Jason Monk
2015-08-10 14:56:52 +00:00
committed by Android Git Automerger
parent e6639066bd 4218e46a32
commit a5c0c209c5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,8 +88,10 @@ public class MobileSignalController extends SignalController<
mapIconSets();
mLastState.networkName = mCurrentState.networkName = mNetworkNameDefault;
mLastState.networkNameData = mCurrentState.networkNameData = mNetworkNameDefault;
String networkName = info.getCarrierName() != null ? info.getCarrierName().toString()
: mNetworkNameDefault;
mLastState.networkName = mCurrentState.networkName = networkName;
mLastState.networkNameData = mCurrentState.networkNameData = networkName;
mLastState.enabled = mCurrentState.enabled = hasMobileData;
mLastState.iconGroup = mCurrentState.iconGroup = mDefaultIcons;
// Get initial data sim state.