wifi data usage: Query wifi usage per configuration
- Updated to use the AllNetworkKeys set instead of NetworkId. - Fix crash issue when mDataUsageController is not created. - See b/126299427#comment37 for a screenshot. Bug: 126299427 Test: manual test make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test make RunSettingsRoboTests ROBOTEST_FILTER=WifiDataUsageSummaryPreferenceControllerTest Change-Id: I26289fde1f18d97631448edc71e034d33b865cc4
This commit is contained in:
@@ -123,13 +123,13 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
|
||||
mDataUsageController = null;
|
||||
}
|
||||
|
||||
private void updateConfiguration(Context context,
|
||||
protected void updateConfiguration(Context context,
|
||||
int subscriptionId, SubscriptionInfo subInfo) {
|
||||
final NetworkPolicyManager policyManager =
|
||||
context.getSystemService(NetworkPolicyManager.class);
|
||||
mPolicyEditor = new NetworkPolicyEditor(policyManager);
|
||||
|
||||
mDataUsageController = new DataUsageController(context);
|
||||
mDataUsageController = createDataUsageController(context);
|
||||
mDataUsageController.setSubscriptionId(subscriptionId);
|
||||
mDataInfoController = new DataUsageInfoController();
|
||||
|
||||
@@ -145,6 +145,11 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
DataUsageController createDataUsageController(Context context) {
|
||||
return new DataUsageController(context);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
DataUsageSummaryPreferenceController(
|
||||
DataUsageController dataUsageController,
|
||||
@@ -186,8 +191,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
|
||||
.getSubscriptionPlans(subscriptionId);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
SubscriptionInfo getSubscriptionInfo(int subscriptionId) {
|
||||
protected SubscriptionInfo getSubscriptionInfo(int subscriptionId) {
|
||||
if (!mHasMobileData) {
|
||||
return null;
|
||||
}
|
||||
|
Reference in New Issue
Block a user