Merge "Actually move to Global settings." into jb-mr1-dev

jsharkey · Android (Google) Code Review · commit 04a34b375513 · 2012-09-14T13:49:24.000-07:00
diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java
@@ -59,9 +59,9 @@ public static synchronized NtpTrustedTime getInstance(Context context) {
             final long defaultTimeout = res.getInteger(
                     com.android.internal.R.integer.config_ntpTimeout);
 
-            final String secureServer = Settings.Secure.getString(
+            final String secureServer = Settings.Global.getString(
                     resolver, Settings.Global.NTP_SERVER);
-            final long timeout = Settings.Secure.getLong(
+            final long timeout = Settings.Global.getLong(
                     resolver, Settings.Global.NTP_TIMEOUT, defaultTimeout);
 
             final String server = secureServer != null ? secureServer : defaultServer;
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
@@ -96,6 +96,7 @@
 import com.android.internal.net.VpnProfile;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.am.BatteryStatsService;
 import com.android.server.connectivity.Tethering;
 import com.android.server.connectivity.Vpn;
@@ -2593,7 +2594,8 @@ private int getRestoreDefaultNetworkDelay(int networkType) {
     }
 
     @Override
-    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+    protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
         if (mContext.checkCallingOrSelfPermission(
                 android.Manifest.permission.DUMP)
                 != PackageManager.PERMISSION_GRANTED) {
@@ -2602,20 +2604,28 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
                     Binder.getCallingUid());
             return;
         }
+
+        // TODO: add locking to get atomic snapshot
         pw.println();
-        for (NetworkStateTracker nst : mNetTrackers) {
+        for (int i = 0; i < mNetTrackers.length; i++) {
+            final NetworkStateTracker nst = mNetTrackers[i];
             if (nst != null) {
+                pw.println("NetworkStateTracker for " + getNetworkTypeName(i) + ":");
+                pw.increaseIndent();
                 if (nst.getNetworkInfo().isConnected()) {
                     pw.println("Active network: " + nst.getNetworkInfo().
                             getTypeName());
                 }
                 pw.println(nst.getNetworkInfo());
+                pw.println(nst.getLinkProperties());
                 pw.println(nst);
                 pw.println();
+                pw.decreaseIndent();
             }
         }
 
         pw.println("Network Requester Pids:");
+        pw.increaseIndent();
         for (int net : mPriorityList) {
             String pidString = net + ": ";
             for (Object pid : mNetRequestersPids[net]) {
@@ -2624,12 +2634,15 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
             pw.println(pidString);
         }
         pw.println();
+        pw.decreaseIndent();
 
         pw.println("FeatureUsers:");
+        pw.increaseIndent();
         for (Object requester : mFeatureUsers) {
             pw.println(requester.toString());
         }
         pw.println();
+        pw.decreaseIndent();
 
         synchronized (this) {
             pw.println("NetworkTranstionWakeLock is currently " +
@@ -2643,9 +2656,11 @@ protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         if (mInetLog != null) {
             pw.println();
             pw.println("Inet condition reports:");
+            pw.increaseIndent();
             for(int i = 0; i < mInetLog.size(); i++) {
                 pw.println(mInetLog.get(i));
             }
+            pw.decreaseIndent();
         }
     }
 
diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
@@ -1218,71 +1218,71 @@ public DefaultNetworkStatsSettings(Context context) {
             // TODO: adjust these timings for production builds
         }
 
-        private long getSecureLong(String name, long def) {
-            return Settings.Secure.getLong(mResolver, name, def);
+        private long getGlobalLong(String name, long 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;
-            return Settings.Secure.getInt(mResolver, name, defInt) != 0;
+            return Settings.Global.getInt(mResolver, name, defInt) != 0;
         }
 
         @Override
         public long getPollInterval() {
-            return getSecureLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);
+            return getGlobalLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);
         }
         @Override
         public long getTimeCacheMaxAge() {
-            return getSecureLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);
+            return getGlobalLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);
         }
         @Override
         public long getGlobalAlertBytes(long def) {
-            return getSecureLong(NETSTATS_GLOBAL_ALERT_BYTES, def);
+            return getGlobalLong(NETSTATS_GLOBAL_ALERT_BYTES, def);
         }
         @Override
         public boolean getSampleEnabled() {
-            return getSecureBoolean(NETSTATS_SAMPLE_ENABLED, true);
+            return getGlobalBoolean(NETSTATS_SAMPLE_ENABLED, true);
         }
         @Override
         public boolean getReportXtOverDev() {
-            return getSecureBoolean(NETSTATS_REPORT_XT_OVER_DEV, true);
+            return getGlobalBoolean(NETSTATS_REPORT_XT_OVER_DEV, true);
         }
         @Override
         public Config getDevConfig() {
-            return new Config(getSecureLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),
-                    getSecureLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),
-                    getSecureLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));
+            return new Config(getGlobalLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),
+                    getGlobalLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),
+                    getGlobalLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));
         }
         @Override
         public Config getXtConfig() {
             return getDevConfig();
         }
         @Override
         public Config getUidConfig() {
-            return new Config(getSecureLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
-                    getSecureLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),
-                    getSecureLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));
+            return new Config(getGlobalLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
+                    getGlobalLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),
+                    getGlobalLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));
         }
         @Override
         public Config getUidTagConfig() {
-            return new Config(getSecureLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
-                    getSecureLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),
-                    getSecureLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));
+            return new Config(getGlobalLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
+                    getGlobalLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),
+                    getGlobalLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));
         }
         @Override
         public long getDevPersistBytes(long def) {
-            return getSecureLong(NETSTATS_DEV_PERSIST_BYTES, def);
+            return getGlobalLong(NETSTATS_DEV_PERSIST_BYTES, def);
         }
         @Override
         public long getXtPersistBytes(long def) {
             return getDevPersistBytes(def);
         }
         @Override
         public long getUidPersistBytes(long def) {
-            return getSecureLong(NETSTATS_UID_PERSIST_BYTES, def);
+            return getGlobalLong(NETSTATS_UID_PERSIST_BYTES, def);
         }
         @Override
         public long getUidTagPersistBytes(long def) {
-            return getSecureLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);
+            return getGlobalLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1218,71 +1218,71 @@ public DefaultNetworkStatsSettings(Context context) {`
`1218`	`1218`	`// TODO: adjust these timings for production builds`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`- private long getSecureLong(String name, long def) {`
`1222`		`- return Settings.Secure.getLong(mResolver, name, def);`
	`1221`	`+ private long getGlobalLong(String name, long def) {`
	`1222`	`+ return Settings.Global.getLong(mResolver, name, def);`
`1223`	`1223`	`}`
`1224`		`- private boolean getSecureBoolean(String name, boolean def) {`
	`1224`	`+ private boolean getGlobalBoolean(String name, boolean def) {`
`1225`	`1225`	`final int defInt = def ? 1 : 0;`
`1226`		`- return Settings.Secure.getInt(mResolver, name, defInt) != 0;`
	`1226`	`+ return Settings.Global.getInt(mResolver, name, defInt) != 0;`
`1227`	`1227`	`}`
`1228`	`1228`
`1229`	`1229`	`@Override`
`1230`	`1230`	`public long getPollInterval() {`
`1231`		`- return getSecureLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);`
	`1231`	`+ return getGlobalLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);`
`1232`	`1232`	`}`
`1233`	`1233`	`@Override`
`1234`	`1234`	`public long getTimeCacheMaxAge() {`
`1235`		`- return getSecureLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);`
	`1235`	`+ return getGlobalLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);`
`1236`	`1236`	`}`
`1237`	`1237`	`@Override`
`1238`	`1238`	`public long getGlobalAlertBytes(long def) {`
`1239`		`- return getSecureLong(NETSTATS_GLOBAL_ALERT_BYTES, def);`
	`1239`	`+ return getGlobalLong(NETSTATS_GLOBAL_ALERT_BYTES, def);`
`1240`	`1240`	`}`
`1241`	`1241`	`@Override`
`1242`	`1242`	`public boolean getSampleEnabled() {`
`1243`		`- return getSecureBoolean(NETSTATS_SAMPLE_ENABLED, true);`
	`1243`	`+ return getGlobalBoolean(NETSTATS_SAMPLE_ENABLED, true);`
`1244`	`1244`	`}`
`1245`	`1245`	`@Override`
`1246`	`1246`	`public boolean getReportXtOverDev() {`
`1247`		`- return getSecureBoolean(NETSTATS_REPORT_XT_OVER_DEV, true);`
	`1247`	`+ return getGlobalBoolean(NETSTATS_REPORT_XT_OVER_DEV, true);`
`1248`	`1248`	`}`
`1249`	`1249`	`@Override`
`1250`	`1250`	`public Config getDevConfig() {`
`1251`		`- return new Config(getSecureLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),`
`1252`		`- getSecureLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),`
`1253`		`- getSecureLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));`
	`1251`	`+ return new Config(getGlobalLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),`
	`1252`	`+ getGlobalLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),`
	`1253`	`+ getGlobalLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));`
`1254`	`1254`	`}`
`1255`	`1255`	`@Override`
`1256`	`1256`	`public Config getXtConfig() {`
`1257`	`1257`	`return getDevConfig();`
`1258`	`1258`	`}`
`1259`	`1259`	`@Override`
`1260`	`1260`	`public Config getUidConfig() {`
`1261`		`- return new Config(getSecureLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),`
`1262`		`- getSecureLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),`
`1263`		`- getSecureLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));`
	`1261`	`+ return new Config(getGlobalLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),`
	`1262`	`+ getGlobalLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),`
	`1263`	`+ getGlobalLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));`
`1264`	`1264`	`}`
`1265`	`1265`	`@Override`
`1266`	`1266`	`public Config getUidTagConfig() {`
`1267`		`- return new Config(getSecureLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),`
`1268`		`- getSecureLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),`
`1269`		`- getSecureLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));`
	`1267`	`+ return new Config(getGlobalLong(NETSTATS_UID_TAG_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),`
	`1268`	`+ getGlobalLong(NETSTATS_UID_TAG_ROTATE_AGE, 5 * DAY_IN_MILLIS),`
	`1269`	`+ getGlobalLong(NETSTATS_UID_TAG_DELETE_AGE, 15 * DAY_IN_MILLIS));`
`1270`	`1270`	`}`
`1271`	`1271`	`@Override`
`1272`	`1272`	`public long getDevPersistBytes(long def) {`
`1273`		`- return getSecureLong(NETSTATS_DEV_PERSIST_BYTES, def);`
	`1273`	`+ return getGlobalLong(NETSTATS_DEV_PERSIST_BYTES, def);`
`1274`	`1274`	`}`
`1275`	`1275`	`@Override`
`1276`	`1276`	`public long getXtPersistBytes(long def) {`
`1277`	`1277`	`return getDevPersistBytes(def);`
`1278`	`1278`	`}`
`1279`	`1279`	`@Override`
`1280`	`1280`	`public long getUidPersistBytes(long def) {`
`1281`		`- return getSecureLong(NETSTATS_UID_PERSIST_BYTES, def);`
	`1281`	`+ return getGlobalLong(NETSTATS_UID_PERSIST_BYTES, def);`
`1282`	`1282`	`}`
`1283`	`1283`	`@Override`
`1284`	`1284`	`public long getUidTagPersistBytes(long def) {`
`1285`		`- return getSecureLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);`
	`1285`	`+ return getGlobalLong(NETSTATS_UID_TAG_PERSIST_BYTES, def);`
`1286`	`1286`	`}`
`1287`	`1287`	`}`
`1288`	`1288`	`}`