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

Commit 4218e46a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

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

parents a2e39c6a 00aa9d44
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.