Merge "Actually move to Global settings." into jb-mr1-dev (04a34b37) · Commits · e / os / android_frameworks_base

core/java/android/util/NtpTrustedTime.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,9 +59,9 @@ public class NtpTrustedTime implements TrustedTime {
		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;

services/java/com/android/server/ConnectivityService.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ import com.android.internal.net.VpnConfig;
		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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}

		@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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		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();
		}
		}

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

+21 −21

Original line number	Diff line number	Diff line
		@@ -1218,39 +1218,39 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		// 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() {
		@@ -1258,19 +1258,19 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		}
		@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) {
		@@ -1278,11 +1278,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		}
		@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);
		}
		}
		}