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

Commit f6ea9c99 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong summary string show on the network page." into tm-dev

parents b91e43c5 d793e951

src/com/android/settings/network/SubscriptionsPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -274,8 +274,12 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
        String result = mSubsPrefCtrlInjector.getNetworkType(

                mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);

        if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) {

            if (result.isEmpty()) {

                result = mContext.getString(R.string.mobile_data_connection_active);

            } else {

                result = mContext.getString(R.string.preference_summary_default_combination,

                        mContext.getString(R.string.mobile_data_connection_active), result);

            }

        } else if (!isDataInService) {

            result = mContext.getString(R.string.mobile_data_no_connection);

        }