summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2011-06-27 23:45:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-27 23:45:58 -0700
commit82155cfc88c9396de9159659cf246caeb08b5f43 (patch)
tree277a4a6f3df994348ee3cadb8d514fbd25d3866e
parentc853f7ae508ed642948ab837cff47a4a8a31b28b (diff)
parentd94585279f0903259c4434aabe0dbdd141b6dbab (diff)
downloadframeworks_base-82155cfc88c9396de9159659cf246caeb08b5f43.zip
frameworks_base-82155cfc88c9396de9159659cf246caeb08b5f43.tar.gz
frameworks_base-82155cfc88c9396de9159659cf246caeb08b5f43.tar.bz2
Merge "NetworkStatsService: disabled by default"
-rw-r--r--services/java/com/android/server/net/NetworkStatsService.java4
1 files changed, 3 insertions, 1 deletions
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 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
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);