From b0bf1178615dd24be0ddf8f7e85ce44ca547f648 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 16 Feb 2018 17:59:29 +0900 Subject: [PATCH] Don't refcount TRACK_DEFAULT requests. This has no concrete impact on the behavior of ConnectivityService, but in principle TRACK_DEFAULT requests should not be counted toward requests that make a network foreground. It does not have an impact because only VPNs could be affected by this, and VPNs are always in the foreground by definition. Test: runtest frameworks-net Test: cts Change-Id: Id2ae6b5c9d542fe168e64ed713b6ec0a04062c82 --- .../java/com/android/server/connectivity/NetworkAgentInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java index a24f97e535..14b234d833 100644 --- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java +++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java @@ -285,7 +285,6 @@ public class NetworkAgentInfo implements Comparable { int delta = add ? +1 : -1; switch (request.type) { case REQUEST: - case TRACK_DEFAULT: mNumRequestNetworkRequests += delta; break; @@ -294,6 +293,7 @@ public class NetworkAgentInfo implements Comparable { mNumBackgroundNetworkRequests += delta; break; + case TRACK_DEFAULT: case LISTEN: break;