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

am: 46e58e1b40

Change-Id: Id2252b803a33ddadfef71618b3b9106c93c5be2a
This commit is contained in:
Jeff Sharkey
2018-04-20 13:51:02 -07:00
committed by android-build-merger
2 changed files with 16 additions and 2 deletions

View File

@@ -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);