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

Commit 57e089e3 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Resolves unsynced infomation between status bar and... 

Merge "[Settings] Resolves unsynced infomation between status bar and settings" into sc-dev am: 8974f993

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

Change-Id: I48f3dceb4d356dfb28fe210fb60404577f390b24
parents 6eb29afa 8974f993

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

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.telephony.TelephonyDisplayInfo; 
import android.telephony.TelephonyManager;

import android.text.Html;

import android.util.ArraySet;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.collection.ArrayMap;
@@ -196,6 +197,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
        mSignalStrengthListener.pause();

        mTelephonyDisplayInfoListener.pause();

        unRegisterReceiver();

        resetProviderPreferenceSummary();

    }



    @Override
@@ -275,6 +277,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
        String result = mSubsPrefCtrlInjector.getNetworkType(

                mContext, mConfig, mTelephonyDisplayInfo, subId, isActiveCarrierNetwork);

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

            Log.i(TAG, "Active cellular network or active carrier network.");

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

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

        } else if (!isDataInService) {
@@ -316,6 +319,13 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl 
        return icon;

    }



    private void resetProviderPreferenceSummary() {

        if (mSubsGearPref == null) {

            return;

        }

        mSubsGearPref.setSummary("");

    }



    private void updateForBase() {

        final Map<Integer, Preference> existingPrefs = mSubscriptionPreferences;

        mSubscriptionPreferences = new ArrayMap<>();