Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev

This commit is contained in:
Bonian Chen
2020-04-28 12:50:18 +00:00
committed by Android (Google) Code Review

View File

@@ -114,6 +114,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
*/ */
public void init(int subscriptionId) { public void init(int subscriptionId) {
mSubId = subscriptionId; mSubId = subscriptionId;
mHasMobileData = DataUsageUtils.hasMobileData(mContext);
mDataUsageController = null; mDataUsageController = null;
} }
@@ -123,8 +124,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
context.getSystemService(NetworkPolicyManager.class); context.getSystemService(NetworkPolicyManager.class);
mPolicyEditor = new NetworkPolicyEditor(policyManager); mPolicyEditor = new NetworkPolicyEditor(policyManager);
mHasMobileData = DataUsageUtils.hasMobileData(context);
mDataUsageController = new DataUsageController(context); mDataUsageController = new DataUsageController(context);
mDataUsageController.setSubscriptionId(subscriptionId); mDataUsageController.setSubscriptionId(subscriptionId);
mDataInfoController = new DataUsageInfoController(); mDataInfoController = new DataUsageInfoController();