Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94896b2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2121ae767462cf14198db1d23ee45b54070fc7e2
parents 998d42de b6334883

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

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ public class NetworkStatsManager { 
        mContext = context;

        mService = service;

        setPollOnOpen(true);

        setAugmentWithSubscriptionPlan(true);

    }



    /** @hide */

packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java

+0 −4
Original line number Diff line number Diff line
@@ -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();