change remaining frameworks/base Gservices to Secure settings (edc5189c) · Commits · e / os / android_frameworks_base

common/java/com/android/common/AndroidHttpClient.java

+3 −13

Original line number	Diff line number	Diff line
		@@ -339,19 +339,9 @@ public final class AndroidHttpClient implements HttpClient {
		* Shorter data will not be compressed.
		*/
		public static long getMinGzipSize(ContentResolver resolver) {
		String sMinGzipBytes = Settings.Gservices.getString(resolver,
		Settings.Gservices.SYNC_MIN_GZIP_BYTES);

		if (!TextUtils.isEmpty(sMinGzipBytes)) {
		try {
		return Long.parseLong(sMinGzipBytes);
		} catch (NumberFormatException nfe) {
		Log.w(TAG, "Unable to parse " +
		Settings.Gservices.SYNC_MIN_GZIP_BYTES + " " +
		sMinGzipBytes, nfe);
		}
		}
		return DEFAULT_SYNC_MIN_GZIP_BYTES;
		return Settings.Secure.getLong(resolver,
		Settings.Secure.SYNC_MIN_GZIP_BYTES,
		DEFAULT_SYNC_MIN_GZIP_BYTES);
		}

		/* cURL logging support. */

core/java/android/content/SyncManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -859,8 +859,8 @@ class SyncManager implements OnAccountsUpdateListener {
		}

		// Cap the delay
		long maxSyncRetryTimeInSeconds = Settings.Gservices.getLong(mContext.getContentResolver(),
		Settings.Gservices.SYNC_MAX_RETRY_DELAY_IN_SECONDS,
		long maxSyncRetryTimeInSeconds = Settings.Secure.getLong(mContext.getContentResolver(),
		Settings.Secure.SYNC_MAX_RETRY_DELAY_IN_SECONDS,
		DEFAULT_MAX_SYNC_RETRY_TIME_IN_SECONDS);
		if (newDelayInMs > maxSyncRetryTimeInSeconds * 1000) {
		newDelayInMs = maxSyncRetryTimeInSeconds * 1000;

core/java/android/provider/Settings.java

+133 −117

Original line number	Diff line number	Diff line
		@@ -2680,6 +2680,139 @@ public final class Settings {
		*/
		public static final String WIFI_IDLE_MS = "wifi_idle_ms";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface when screen is on, to detect possible data
		* connection problems.
		* @hide
		*/
		public static final String PDP_WATCHDOG_POLL_INTERVAL_MS =
		"pdp_watchdog_poll_interval_ms";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface when screen is off, to detect possible data
		* connection problems.
		* @hide
		*/
		public static final String PDP_WATCHDOG_LONG_POLL_INTERVAL_MS =
		"pdp_watchdog_long_poll_interval_ms";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface after {@link #PDP_WATCHDOG_TRIGGER_PACKET_COUNT}
		* outgoing packets has been reached without incoming packets.
		* @hide
		*/
		public static final String PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS =
		"pdp_watchdog_error_poll_interval_ms";

		/**
		* The number of outgoing packets sent without seeing an incoming packet
		* that triggers a countdown (of {@link #PDP_WATCHDOG_ERROR_POLL_COUNT}
		* device is logged to the event log
		* @hide
		*/
		public static final String PDP_WATCHDOG_TRIGGER_PACKET_COUNT =
		"pdp_watchdog_trigger_packet_count";

		/**
		* The number of polls to perform (at {@link #PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS})
		* after hitting {@link #PDP_WATCHDOG_TRIGGER_PACKET_COUNT} before
		* attempting data connection recovery.
		* @hide
		*/
		public static final String PDP_WATCHDOG_ERROR_POLL_COUNT =
		"pdp_watchdog_error_poll_count";

		/**
		* The number of failed PDP reset attempts before moving to something more
		* drastic: re-registering to the network.
		* @hide
		*/
		public static final String PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT =
		"pdp_watchdog_max_pdp_reset_fail_count";

		/**
		* Address to ping as a last sanity check before attempting any recovery.
		* Unset or set to "0.0.0.0" to skip this check.
		* @hide
		*/
		public static final String PDP_WATCHDOG_PING_ADDRESS = "pdp_watchdog_ping_address";

		/**
		* The "-w deadline" parameter for the ping, ie, the max time in
		* seconds to spend pinging.
		* @hide
		*/
		public static final String PDP_WATCHDOG_PING_DEADLINE = "pdp_watchdog_ping_deadline";

		/**
		* The interval in milliseconds at which to check gprs registration
		* after the first registration mismatch of gprs and voice service,
		* to detect possible data network registration problems.
		*
		* @hide
		*/
		public static final String GPRS_REGISTER_CHECK_PERIOD_MS =
		"gprs_register_check_period_ms";

		/**
		* The length of time in milli-seconds that automatic small adjustments to
		* SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded.
		* @hide
		*/
		public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing";

		/**
		* If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment
		* to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been
		* exceeded.
		* @hide
		*/
		public static final String NITZ_UPDATE_DIFF = "nitz_update_diff";

		/**
		* The maximum reconnect delay for short network outages or when the network is suspended
		* due to phone use.
		* @hide
		*/
		public static final String SYNC_MAX_RETRY_DELAY_IN_SECONDS =
		"sync_max_retry_delay_in_seconds";

		/**
		* The interval in milliseconds at which to check the number of SMS sent
		* out without asking for use permit, to limit the un-authorized SMS
		* usage.
		* @hide
		*/
		public static final String SMS_OUTGOING_CHECK_INTERVAL_MS =
		"sms_outgoing_check_interval_ms";

		/**
		* The number of outgoing SMS sent without asking for user permit
		* (of {@link #SMS_OUTGOING_CHECK_INTERVAL_MS}
		* @hide
		*/
		public static final String SMS_OUTGOING_CHECK_MAX_COUNT =
		"sms_outgoing_check_max_count";

		/**
		* Enable use of ssl session caching.
		* 'db' - save each session in a (per process) database
		* 'file' - save each session in a (per process) file
		* not set or any other value - normal java in-memory caching
		* @hide
		*/
		public static final String SSL_SESSION_CACHE = "ssl_session_cache";

		/**
		* How many bytes long a message has to be, in order to be gzipped.
		* @hide
		*/
		public static final String SYNC_MIN_GZIP_BYTES =
		"sync_min_gzip_bytes";

		/**
		* @hide
		*/
		@@ -3254,20 +3387,6 @@ public final class Settings {
		*/
		public static final String GSYNC_USE_RMQ2_ROUTING_INFO = "gsync_use_rmq2_routing_info";

		/**
		* Enable use of ssl session caching.
		* 'db' - save each session in a (per process) database
		* 'file' - save each session in a (per process) file
		* not set or any other value - normal java in-memory caching
		*/
		public static final String SSL_SESSION_CACHE = "ssl_session_cache";

		/**
		* How many bytes long a message has to be, in order to be gzipped.
		*/
		public static final String SYNC_MIN_GZIP_BYTES =
		"sync_min_gzip_bytes";

		/**
		* The hash value of the current provisioning settings
		*/
		@@ -3539,96 +3658,6 @@ public final class Settings {
		public static final String GOOGLE_SERVICES_PREFIX
		= "google_services:";

		/**
		* The maximum reconnect delay for short network outages or when the network is suspended
		* due to phone use.
		*/
		public static final String SYNC_MAX_RETRY_DELAY_IN_SECONDS =
		"sync_max_retry_delay_in_seconds";

		/**
		* The interval in milliseconds at which to check the number of SMS sent
		* out without asking for use permit, to limit the un-authorized SMS
		* usage.
		*/
		public static final String SMS_OUTGOING_CHECK_INTERVAL_MS =
		"sms_outgoing_check_interval_ms";

		/**
		* The number of outgoing SMS sent without asking for user permit
		* (of {@link #SMS_OUTGOING_CHECK_INTERVAL_MS}
		*/
		public static final String SMS_OUTGOING_CEHCK_MAX_COUNT =
		"sms_outgoing_check_max_count";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface when screen is on, to detect possible data
		* connection problems.
		*/
		public static final String PDP_WATCHDOG_POLL_INTERVAL_MS =
		"pdp_watchdog_poll_interval_ms";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface when screen is off, to detect possible data
		* connection problems.
		*/
		public static final String PDP_WATCHDOG_LONG_POLL_INTERVAL_MS =
		"pdp_watchdog_long_poll_interval_ms";

		/**
		* The interval in milliseconds at which to check packet counts on the
		* mobile data interface after {@link #PDP_WATCHDOG_TRIGGER_PACKET_COUNT}
		* outgoing packets has been reached without incoming packets.
		*/
		public static final String PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS =
		"pdp_watchdog_error_poll_interval_ms";

		/**
		* The number of outgoing packets sent without seeing an incoming packet
		* that triggers a countdown (of {@link #PDP_WATCHDOG_ERROR_POLL_COUNT}
		* device is logged to the event log
		*/
		public static final String PDP_WATCHDOG_TRIGGER_PACKET_COUNT =
		"pdp_watchdog_trigger_packet_count";

		/**
		* The number of polls to perform (at {@link #PDP_WATCHDOG_ERROR_POLL_INTERVAL_MS})
		* after hitting {@link #PDP_WATCHDOG_TRIGGER_PACKET_COUNT} before
		* attempting data connection recovery.
		*/
		public static final String PDP_WATCHDOG_ERROR_POLL_COUNT =
		"pdp_watchdog_error_poll_count";

		/**
		* The number of failed PDP reset attempts before moving to something more
		* drastic: re-registering to the network.
		*/
		public static final String PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT =
		"pdp_watchdog_max_pdp_reset_fail_count";

		/**
		* Address to ping as a last sanity check before attempting any recovery.
		* Unset or set to "0.0.0.0" to skip this check.
		*/
		public static final String PDP_WATCHDOG_PING_ADDRESS = "pdp_watchdog_ping_address";

		/**
		* The "-w deadline" parameter for the ping, ie, the max time in
		* seconds to spend pinging.
		*/
		public static final String PDP_WATCHDOG_PING_DEADLINE = "pdp_watchdog_ping_deadline";

		/**
		* The interval in milliseconds at which to check gprs registration
		* after the first registration mismatch of gprs and voice service,
		* to detect possible data network registration problems.
		*
		*/
		public static final String GPRS_REGISTER_CHECK_PERIOD_MS =
		"gprs_register_check_period_ms";

		/**
		* List of test suites (local disk filename) for the automatic instrumentation test runner.
		* The file format is similar to automated_suites.xml, see AutoTesterService.
		@@ -3755,19 +3784,6 @@ public final class Settings {
		*/
		public static final String LAST_KMSG_KB = "last_kmsg_kb";

		/**
		* The length of time in milli-seconds that automatic small adjustments to
		* SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded.
		*/
		public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing";

		/**
		* If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment
		* to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been
		* exceeded.
		*/
		public static final String NITZ_UPDATE_DIFF = "nitz_update_diff";

		/**
		* @deprecated
		* @hide

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -139,8 +139,6 @@ public class SettingsProvider extends ContentProvider {
		} else if (table.equals("secure")) {
		property = Settings.Secure.SYS_PROP_SETTING_VERSION;
		backedUpDataChanged = true;
		} else if (table.equals("gservices")) {
		property = Settings.Gservices.SYS_PROP_SETTING_VERSION;
		}

		if (property != null) {

telephony/java/com/android/internal/telephony/SMSDispatcher.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -224,11 +224,11 @@ public abstract class SMSDispatcher extends Handler {

		createWakelock();

		int check_period = Settings.Gservices.getInt(mResolver,
		Settings.Gservices.SMS_OUTGOING_CHECK_INTERVAL_MS,
		int check_period = Settings.Secure.getInt(mResolver,
		Settings.Secure.SMS_OUTGOING_CHECK_INTERVAL_MS,
		DEFAULT_SMS_CHECK_PERIOD);
		int max_count = Settings.Gservices.getInt(mResolver,
		Settings.Gservices.SMS_OUTGOING_CEHCK_MAX_COUNT,
		int max_count = Settings.Secure.getInt(mResolver,
		Settings.Secure.SMS_OUTGOING_CHECK_MAX_COUNT,
		DEFAULT_SMS_MAX_COUNT);
		mCounter = new SmsCounter(max_count, check_period);