commit 2cf561722c2661cc0d4db502a44a3021609f307e
author Robin Lee <rgl@google.com> Tue Sep 13 18:55:42 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Thu Oct 27 18:15:49 2016 +0900
tree 0452490582eb6d339cd62a82eedca22b42f30ebb
parent 7e05cc933bf45f7a6e6e93027883f0d329a7101e

Benchmarks for network metrics reporting

Bug: 29748723
Test: this is an APCT test.

(cherry picked from commit 484dac1d071c7476895c4a3184e8dbdd7b63e524)

Change-Id: I482a7d5c15210906069e0fe7ef55ab3f21bfc127

client/FwmarkClient.cpp

diff --git a/client/FwmarkClient.cpp b/client/FwmarkClient.cpp
index a82f4c2..056dfc2 100644
--- a/client/FwmarkClient.cpp
+++ b/client/FwmarkClient.cpp
@@ -32,7 +32,11 @@
 }  // namespace
 
 bool FwmarkClient::shouldSetFwmark(int family) {
-    return (family == AF_INET || family == AF_INET6) && !getenv("ANDROID_NO_USE_FWMARK_CLIENT");
+    return (family == AF_INET || family == AF_INET6) && !getenv(ANDROID_NO_USE_FWMARK_CLIENT);
+}
+
+bool FwmarkClient::shouldReportConnectComplete(int family) {
+    return shouldSetFwmark(family) && !getenv(ANDROID_FWMARK_METRICS_ONLY);
 }
 
 FwmarkClient::FwmarkClient() : mChannel(-1) {