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

Commit b8133adf authored by Evan Laird's avatar Evan Laird
Browse files

Move callback anonymous classes out of constructor 

Cleans up the MobileSignalController constructor a bit. No behavior
change

Bug: 197851948
Test: atest SystemUITests
Change-Id: I6fa7adaa6e2f82f4c4c0a1f01b2ca5339d86d1c6
parent e8d2979e

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

+79 −79
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
    private Config mConfig;

    @VisibleForTesting

    boolean mInflateSignalStrengths = false;

    private MobileStatusTracker.Callback mCallback;

    private RegistrationCallback mRegistrationCallback;

    private int mLastWwanLevel;

    private int mLastWlanLevel;

    private int mLastWlanCrossSimLevel;
@@ -121,51 +119,8 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
    // Where to copy the next state into.

    private int mMobileStatusHistoryIndex;



    // TODO: Reduce number of vars passed in, if we have the NetworkController, probably don't

    // need listener lists anymore.

    public MobileSignalController(

            Context context,

            Config config,

            boolean hasMobileData,

            TelephonyManager phone,

            CallbackHandler callbackHandler,

            NetworkControllerImpl networkController,

            SubscriptionInfo info,

            SubscriptionDefaults defaults,

            Looper receiverLooper,

            CarrierConfigTracker carrierConfigTracker,

            FeatureFlags featureFlags

    ) {

        super("MobileSignalController(" + info.getSubscriptionId() + ")", context,

                NetworkCapabilities.TRANSPORT_CELLULAR, callbackHandler,

                networkController);

        mCarrierConfigTracker = carrierConfigTracker;

        mConfig = config;

        mPhone = phone;

        mDefaults = defaults;

        mSubscriptionInfo = info;

        mNetworkNameSeparator = getTextIfExists(R.string.status_bar_network_name_separator)

                .toString();

        mNetworkNameDefault = getTextIfExists(

                com.android.internal.R.string.lockscreen_carrier_default).toString();

        mReceiverHandler = new Handler(receiverLooper);



        mNetworkToIconLookup = mapIconSets(mConfig);

        mDefaultIcons = getDefaultIcons(mConfig);



        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;

        mObserver = new ContentObserver(new Handler(receiverLooper)) {

            @Override

            public void onChange(boolean selfChange) {

                updateTelephony();

            }

        };

        mCallback = new MobileStatusTracker.Callback() {

    private final MobileStatusTracker.Callback mMobileCallback =

            new MobileStatusTracker.Callback() {

                private String mLastStatus;



                @Override
@@ -194,7 +149,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
                }

            };



        mRegistrationCallback = new RegistrationCallback() {

    private final RegistrationCallback mRegistrationCallback = new RegistrationCallback() {

        @Override

        public void onRegistered(ImsRegistrationAttributes attributes) {

            Log.d(mTag, "onRegistered: " + "attributes=" + attributes);
@@ -239,9 +194,54 @@ public class MobileSignalController extends SignalController<MobileState, Mobile 
            notifyCallStateChange(statusIcon, mSubscriptionInfo.getSubscriptionId());

        }

    };



    // TODO: Reduce number of vars passed in, if we have the NetworkController, probably don't

    // need listener lists anymore.

    public MobileSignalController(

            Context context,

            Config config,

            boolean hasMobileData,

            TelephonyManager phone,

            CallbackHandler callbackHandler,

            NetworkControllerImpl networkController,

            SubscriptionInfo info,

            SubscriptionDefaults defaults,

            Looper receiverLooper,

            CarrierConfigTracker carrierConfigTracker,

            FeatureFlags featureFlags

    ) {

        super("MobileSignalController(" + info.getSubscriptionId() + ")", context,

                NetworkCapabilities.TRANSPORT_CELLULAR, callbackHandler,

                networkController);

        mCarrierConfigTracker = carrierConfigTracker;

        mConfig = config;

        mPhone = phone;

        mDefaults = defaults;

        mSubscriptionInfo = info;

        mNetworkNameSeparator = getTextIfExists(

                R.string.status_bar_network_name_separator).toString();

        mNetworkNameDefault = getTextIfExists(

                com.android.internal.R.string.lockscreen_carrier_default).toString();

        mReceiverHandler = new Handler(receiverLooper);



        mNetworkToIconLookup = mapIconSets(mConfig);

        mDefaultIcons = getDefaultIcons(mConfig);



        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;

        mObserver = new ContentObserver(new Handler(receiverLooper)) {

            @Override

            public void onChange(boolean selfChange) {

                updateTelephony();

            }

        };

        mImsMmTelManager = ImsMmTelManager.createForSubscriptionId(info.getSubscriptionId());

        mMobileStatusTracker = new MobileStatusTracker(mPhone, receiverLooper,

                info, mDefaults, mCallback);

                info, mDefaults, mMobileCallback);

        mProviderModelBehavior = featureFlags.isCombinedStatusBarSignalIconsEnabled();

        mProviderModelSetting = featureFlags.isProviderModelSettingEnabled();

    }