Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb34b41 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 850e5ee1: am a5c0c209: am 4218e46a: Merge "Initialize network name better...

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

* commit '850e5ee1':
  Initialize network name better in NetworkController
parents fc284814 850e5ee1
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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.