PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Refactor DataUsageSummaryPreferenceController" am: aa08222778

Browse Source 
Change-Id: I15618005ab8331242323d20bbb1c36dd0a8996e1
This commit is contained in:
Automerger Merge Worker
2020-03-13 12:14:30 +00:00
parent 3fd54b4e67 aa08222778
commit df7216a144
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
View File

@@ -40,6 +40,7 @@ import com.android.internal.util.CollectionUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.widget.EntityHeaderController; import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -117,8 +118,8 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
NetworkPolicyManager policyManager = activity.getSystemService(NetworkPolicyManager.class); NetworkPolicyManager policyManager = activity.getSystemService(NetworkPolicyManager.class);
mPolicyEditor = new NetworkPolicyEditor(policyManager); mPolicyEditor = new NetworkPolicyEditor(policyManager);
mHasMobileData = DataUsageUtils.hasMobileData(activity) mHasMobileData = SubscriptionManager.isValidSubscriptionId(mSubscriptionId)
&& mSubscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID; && DataUsageUtils.hasMobileData(activity);
mDataUsageController = new DataUsageController(activity); mDataUsageController = new DataUsageController(activity);
mDataUsageController.setSubscriptionId(mSubscriptionId); mDataUsageController.setSubscriptionId(mSubscriptionId);
@@ -270,11 +271,10 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
mCycleEnd = info.cycleEnd; mCycleEnd = info.cycleEnd;
mSnapshotTime = -1L; mSnapshotTime = -1L;
SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId); final ProxySubscriptionManager proxySubsciptionMgr =
if (subInfo == null) { ProxySubscriptionManager.getInstance(mContext);
subInfo = mSubscriptionManager.getAllSubscriptionInfoList().stream().filter( final SubscriptionInfo subInfo = proxySubsciptionMgr
i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null); .getAccessibleSubscriptionInfo(mSubscriptionId);
}
if (subInfo != null && mHasMobileData) { if (subInfo != null && mHasMobileData) {
mCarrierName = subInfo.getCarrierName(); mCarrierName = subInfo.getCarrierName();
List<SubscriptionPlan> plans = mSubscriptionManager.getSubscriptionPlans( List<SubscriptionPlan> plans = mSubscriptionManager.getSubscriptionPlans(