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

Commit 4cdf6e58 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Give CTS a way to force-poll network stats." into pi-dev am: 46e58e1b 

am: 77c7b732

Change-Id: I93be7a46fc345efc31e98975c65a287f2d344220
parents 4c6bb140 77c7b732

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ package android.app.backup { 


package android.app.usage {



  public class NetworkStatsManager {

    method public void setPollForce(boolean);

  }



  public class StorageStatsManager {

    method public boolean isQuotaSupported(java.util.UUID);

    method public boolean isReservedSupported(java.util.UUID);

core/java/android/app/usage/NetworkStatsManager.java

+14 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.internal.util.Preconditions.checkNotNull; 


import android.annotation.Nullable;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.app.usage.NetworkStats.Bucket;

import android.content.Context;

import android.net.ConnectivityManager;
@@ -111,7 +112,9 @@ public class NetworkStatsManager { 
    /** @hide */

    public static final int FLAG_POLL_ON_OPEN = 1 << 0;

    /** @hide */

    public static final int FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN = 1 << 1;

    public static final int FLAG_POLL_FORCE = 1 << 1;

    /** @hide */

    public static final int FLAG_AUGMENT_WITH_SUBSCRIPTION_PLAN = 1 << 2;



    private int mFlags;
@@ -140,6 +143,16 @@ public class NetworkStatsManager { 
        }

    }



    /** @hide */

    @TestApi

    public void setPollForce(boolean pollForce) {

        if (pollForce) {

            mFlags |= FLAG_POLL_FORCE;

        } else {

            mFlags &= ~FLAG_POLL_FORCE;

        }

    }



    /** @hide */

    public void setAugmentWithSubscriptionPlan(boolean augmentWithSubscriptionPlan) {

        if (augmentWithSubscriptionPlan) {

services/core/java/com/android/server/net/NetworkStatsService.java

+2 −1
Original line number Diff line number Diff line
@@ -543,7 +543,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        final int usedFlags = isRateLimitedForPoll(callingUid)

                ? flags & (~NetworkStatsManager.FLAG_POLL_ON_OPEN)

                : flags;

        if ((usedFlags & NetworkStatsManager.FLAG_POLL_ON_OPEN) != 0) {

        if ((usedFlags & (NetworkStatsManager.FLAG_POLL_ON_OPEN

                | NetworkStatsManager.FLAG_POLL_FORCE)) != 0) {

            final long ident = Binder.clearCallingIdentity();

            try {

                performPoll(FLAG_PERSIST_ALL);