commit 82155cfc88c9396de9159659cf246caeb08b5f43
author JP Abgrall <jpa@google.com> Mon Jun 27 23:45:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 23:45:58 2011 -0700
tree 277a4a6f3df994348ee3cadb8d514fbd25d3866e
parent c853f7ae508ed642948ab837cff47a4a8a31b28b
parent d94585279f0903259c4434aabe0dbdd141b6dbab

Merge "NetworkStatsService: disabled by default"

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

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index 524dd40..4a79d17 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -1062,7 +1062,9 @@
                 Slog.w(TAG, "kernel does not support bandwidth control");
                 return false;
             }
-            return Settings.Secure.getInt(mResolver, NETSTATS_ENABLED, 1) != 0;
+            // TODO: once things stabilize, enable by default.
+            // For now: ./vendor/google/tools/override-gservices secure:netstats_enabled=1
+            return Settings.Secure.getInt(mResolver, NETSTATS_ENABLED, 0) != 0;
         }
         public long getPollInterval() {
             return getSecureLong(NETSTATS_POLL_INTERVAL, 15 * MINUTE_IN_MILLIS);