Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev
This commit is contained in:
@@ -78,10 +78,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
|
||||
super.onCreate(icicle);
|
||||
Context context = getContext();
|
||||
|
||||
// Enable ProxySubscriptionMgr with Lifecycle support for all controllers
|
||||
// live within this fragment
|
||||
mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
|
||||
mProxySubscriptionMgr.setLifecycle(getLifecycle());
|
||||
enableProxySubscriptionManager(context);
|
||||
|
||||
boolean hasMobileData = DataUsageUtils.hasMobileData(context);
|
||||
|
||||
@@ -151,6 +148,14 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
|
||||
addMobileSection(subId, null);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void enableProxySubscriptionManager(Context context) {
|
||||
// Enable ProxySubscriptionMgr with Lifecycle support for all controllers
|
||||
// live within this fragment
|
||||
mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);
|
||||
mProxySubscriptionMgr.setLifecycle(getLifecycle());
|
||||
}
|
||||
|
||||
private void addMobileSection(int subId, SubscriptionInfo subInfo) {
|
||||
TemplatePreferenceCategory category = (TemplatePreferenceCategory)
|
||||
inflatePreferences(R.xml.data_usage_cellular);
|
||||
|
||||
Reference in New Issue
Block a user