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

Commit 90875efc authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834



Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7cbd6997 f6ea9c99

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);

        }