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

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

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

* commit '4218e46a':
  Initialize network name better in NetworkController
parents e6639066 4218e46a
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.