Merge "Initialize network name better in NetworkController" into mnc-dev

This commit is contained in:
Jason Monk
2015-08-10 14:50:45 +00:00
committed by Android (Google) Code Review

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.