Merge "[MS18] Augment data usage by default" am: de62afa978

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931615

Change-Id: I72276ebd4a3fc42ab9459dafcaa4c232ca4d9442

framework-t/src/android/app/usage/NetworkStatsManager.java

@@ -139,6 +139,7 @@ public class NetworkStatsManager {
         mContext = context;
         mService = service;
         setPollOnOpen(true);
+        setAugmentWithSubscriptionPlan(true);
     }
 
     /** @hide */

service-t/src/com/android/server/net/NetworkStatsService.java

@@ -655,8 +655,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
 
     @Override
     public INetworkStatsSession openSession() {
-        // NOTE: if callers want to get non-augmented data, they should go
-        // through the public API
         return openSessionInternal(NetworkStatsManager.FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN, null);
     }
 
@@ -876,8 +874,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
     private long getNetworkTotalBytes(NetworkTemplate template, long start, long end) {
         assertSystemReady();
 
-        // NOTE: if callers want to get non-augmented data, they should go
-        // through the public API
         return internalGetSummaryForNetwork(template,
                 NetworkStatsManager.FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN, start, end,
                 NetworkStatsAccess.Level.DEVICE, Binder.getCallingUid()).getTotalBytes();