LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev

Browse Source 
* commit '04a34b375513eaeec67f54bb203ef6b763328751':
  Actually move to Global settings.
This commit is contained in:
Jeff Sharkey
2012-09-14 13:51:10 -07:00
committed by Android Git Automerger
parent eb92325f0e 77127d1c93
commit 9e52673e90
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -1218,39 +1218,39 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// TODO: adjust these timings for production builds // TODO: adjust these timings for production builds
} }
private long getSecureLong(String name, long def) { private long getGlobalLong(String name, long def) {
return Settings.Secure.getLong(mResolver, name, def); return Settings.Global.getLong(mResolver, name, def);
} }
private boolean getSecureBoolean(String name, boolean def) { private boolean getGlobalBoolean(String name, boolean def) {
final int defInt = def ? 1 : 0; final int defInt = def ? 1 : 0;
return Settings.Secure.getInt(mResolver, name, defInt) != 0; return Settings.Global.getInt(mResolver, name, defInt) != 0;
} }
@Override @Override
public long getPollInterval() { public long getPollInterval() {
return getSecureLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS); return getGlobalLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);
} }
@Override @Override
public long getTimeCacheMaxAge() { public long getTimeCacheMaxAge() {
return getSecureLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS); return getGlobalLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);
} }
@Override @Override
public long getGlobalAlertBytes(long def) { public long getGlobalAlertBytes(long def) {
return getSecureLong(NETSTATS_GLOBAL_ALERT_BYTES, def); return getGlobalLong(NETSTATS_GLOBAL_ALERT_BYTES, def);
} }
@Override @Override
public boolean getSampleEnabled() { public boolean getSampleEnabled() {
return getSecureBoolean(NETSTATS_SAMPLE_ENABLED, true); return getGlobalBoolean(NETSTATS_SAMPLE_ENABLED, true);
} }
@Override @Override
public boolean getReportXtOverDev() { public boolean getReportXtOverDev() {
return getSecureBoolean(NETSTATS_REPORT_XT_OVER_DEV, true); return getGlobalBoolean(NETSTATS_REPORT_XT_OVER_DEV, true);
} }
@Override @Override
public Config getDevConfig() { public Config getDevConfig() {
return new Config(getSecureLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS), return new Config(getGlobalLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),
getSecureLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS), getGlobalLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),
getSecureLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS)); getGlobalLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));
} }
@Override @Override
public Config getXtConfig() { public Config getXtConfig() {
@@ -1258,19 +1258,19 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
@Override @Override
public Config getUidConfig() { public Config getUidConfig() {
return new Config(getSecureLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS), return new Config(getGlobalLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
getSecureLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS), getGlobalLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),
getSecureLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS)); getGlobalLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));
} }
@Override @Override
public Config getUidTagConfig() { public Config getUidTagConfig() {
return new Config(getSecureLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS), return new Config(getGlobalLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
getSecureLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS), getGlobalLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),
getSecureLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS)); getGlobalLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));
} }
@Override @Override
public long getDevPersistBytes(long def) { public long getDevPersistBytes(long def) {
return getSecureLong(NETSTATS_DEV_PERSIST_BYTES, def); return getGlobalLong(NETSTATS_DEV_PERSIST_BYTES, def);
} }
@Override @Override
public long getXtPersistBytes(long def) { public long getXtPersistBytes(long def) {
@@ -1278,11 +1278,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
@Override @Override
public long getUidPersistBytes(long def) { public long getUidPersistBytes(long def) {
return getSecureLong(NETSTATS_UID_PERSIST_BYTES, def); return getGlobalLong(NETSTATS_UID_PERSIST_BYTES, def);
} }
@Override @Override
public long getUidTagPersistBytes(long def) { public long getUidTagPersistBytes(long def) {
return getSecureLong(NETSTATS_UID_TAG_PERSIST_BYTES, def); return getGlobalLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);
} }
} }
} }