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

Commit a62812a3 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Should show LTE instead of LTE+" into sc-qpr1-dev am:... 

Merge "[Provider Model] Should show LTE instead of LTE+" into sc-qpr1-dev am: a5468521 am: 7cc7ded0 am: 6aedc5e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903066

Change-Id: Id98bb2744af3c0617e647171c974ac3c0167cd92
parents b5954546 6aedc5e7

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+8 −5
Original line number Diff line number Diff line
@@ -215,10 +215,10 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
        mKeyguardStateController = keyguardStateController;

        mConnectionStateFilter = new IntentFilter();

        mConnectionStateFilter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        mConnectionStateFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);

        mUiEventLogger = uiEventLogger;

        mActivityStarter = starter;

        mAccessPointController = accessPointController;

        mConfig = MobileMappings.Config.readConfig(mContext);

        mWifiIconInjector = new WifiUtils.InternetIconInjector(mContext);

        mConnectivityManagerNetworkCallback = new DataConnectivityListener();

        mWindowManager = windowManager;
@@ -242,6 +242,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
        if (DEBUG) {

            Log.d(TAG, "Init, SubId: " + mDefaultDataSubId);

        }

        mConfig = MobileMappings.Config.readConfig(mContext);

        mTelephonyManager = mTelephonyManager.createForSubscriptionId(mDefaultDataSubId);

        mInternetTelephonyCallback = new InternetTelephonyCallback();

        mTelephonyManager.registerTelephonyCallback(mExecutor, mInternetTelephonyCallback);
@@ -545,7 +546,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
    String getMobileNetworkSummary() {

        String description = getNetworkTypeDescription(mContext, mConfig,

                mTelephonyDisplayInfo, mDefaultDataSubId);

        return getMobileSummary(mContext, mTelephonyManager, description);

        return getMobileSummary(mContext, description);

    }



    /**
@@ -573,8 +574,7 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
                ? SubscriptionManager.getResourcesForSubId(context, subId).getString(resId) : "";

    }



    private String getMobileSummary(Context context, TelephonyManager telephonyManager,

            String networkTypeDescription) {

    private String getMobileSummary(Context context, String networkTypeDescription) {

        if (!isMobileDataEnabled()) {

            return context.getString(R.string.mobile_data_off_summary);

        }
@@ -953,10 +953,13 @@ public class InternetDialogController implements WifiEntry.DisconnectCallback, 
        @Override

        public void onReceive(Context context, Intent intent) {

            final String action = intent.getAction();

            if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {

            if (TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED.equals(action)) {

                if (DEBUG) {

                    Log.d(TAG, "ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED");

                }

                mConfig = MobileMappings.Config.readConfig(context);

                updateListener();

            } else if (WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION.equals(action)) {

                updateListener();

            }

        }