LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I2121ae767462cf14198db1d23ee45b54070fc7e2
This commit is contained in:
Treehugger Robot
2021-12-28 07:03:36 +00:00
committed by Automerger Merge Worker
parent add875e332 9b52bb78d2
commit cecf7983ae
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework-t/src/android/app/usage/NetworkStatsManager.java
View File

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

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

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