Use new API to build NetworkTemplate

This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.

Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
This commit is contained in:
Lei Yu
2019-05-28 10:05:44 -07:00
parent 76cf0dbddd
commit ded55a1401
4 changed files with 26 additions and 33 deletions

View File

@@ -58,10 +58,7 @@ public class BillingCyclePreferenceController extends BasePreferenceController {
services.mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
services.mUserManager = mContext.getSystemService(UserManager.class);
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
services.mTelephonyManager.getSubscriberId(mSubscriptionId));
NetworkTemplate template = NetworkTemplate.normalize(mobileAll,
services.mTelephonyManager.getMergedSubscriberIds());
NetworkTemplate template = DataUsageUtils.getMobileTemplate(mContext, mSubscriptionId);
preference.setTemplate(template, mSubscriptionId, services);
}