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

Commit eb4f8d7c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa082227 am: df7216a1 

Change-Id: I3b4e01db0e0290290e6e962ae609f98521de23ee
parents caa0c9e1 df7216a1

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

+7 −7
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.util.CollectionUtils; 
import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.network.ProxySubscriptionManager;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.NetworkPolicyEditor;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -117,8 +118,8 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll 
        NetworkPolicyManager policyManager = activity.getSystemService(NetworkPolicyManager.class);

        mPolicyEditor = new NetworkPolicyEditor(policyManager);



        mHasMobileData = DataUsageUtils.hasMobileData(activity)

                && mSubscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        mHasMobileData = SubscriptionManager.isValidSubscriptionId(mSubscriptionId)

                && DataUsageUtils.hasMobileData(activity);



        mDataUsageController = new DataUsageController(activity);

        mDataUsageController.setSubscriptionId(mSubscriptionId);
@@ -270,11 +271,10 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll 
        mCycleEnd = info.cycleEnd;

        mSnapshotTime = -1L;



        SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId);

        if (subInfo == null) {

            subInfo = mSubscriptionManager.getAllSubscriptionInfoList().stream().filter(

                    i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null);

        }

        final ProxySubscriptionManager proxySubsciptionMgr =

                ProxySubscriptionManager.getInstance(mContext);

        final SubscriptionInfo subInfo = proxySubsciptionMgr

                .getAccessibleSubscriptionInfo(mSubscriptionId);

        if (subInfo != null && mHasMobileData) {

            mCarrierName = subInfo.getCarrierName();

            List<SubscriptionPlan> plans = mSubscriptionManager.getSubscriptionPlans(