Merge "move Watchdog's settings from Gservices to Secure" (914d6597) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+127 −111

Original line number	Diff line number	Diff line
		@@ -2451,6 +2451,133 @@ public final class Settings {
		*/
		public static final String LAST_SETUP_SHOWN = "last_setup_shown";

		/**
		* How frequently (in seconds) to check the memory status of the
		* device.
		* @hide
		*/
		public static final String MEMCHECK_INTERVAL = "memcheck_interval";

		/**
		* Max frequency (in seconds) to log memory check stats, in realtime
		* seconds. This allows for throttling of logs when the device is
		* running for large amounts of time.
		* @hide
		*/
		public static final String MEMCHECK_LOG_REALTIME_INTERVAL =
		"memcheck_log_realtime_interval";

		/**
		* Boolean indicating whether rebooting due to system memory checks
		* is enabled.
		* @hide
		*/
		public static final String MEMCHECK_SYSTEM_ENABLED = "memcheck_system_enabled";

		/**
		* How many bytes the system process must be below to avoid scheduling
		* a soft reboot. This reboot will happen when it is next determined
		* to be a good time.
		* @hide
		*/
		public static final String MEMCHECK_SYSTEM_SOFT_THRESHOLD = "memcheck_system_soft";

		/**
		* How many bytes the system process must be below to avoid scheduling
		* a hard reboot. This reboot will happen immediately.
		* @hide
		*/
		public static final String MEMCHECK_SYSTEM_HARD_THRESHOLD = "memcheck_system_hard";

		/**
		* How many bytes the phone process must be below to avoid scheduling
		* a soft restart. This restart will happen when it is next determined
		* to be a good time.
		* @hide
		*/
		public static final String MEMCHECK_PHONE_SOFT_THRESHOLD = "memcheck_phone_soft";

		/**
		* How many bytes the phone process must be below to avoid scheduling
		* a hard restart. This restart will happen immediately.
		* @hide
		*/
		public static final String MEMCHECK_PHONE_HARD_THRESHOLD = "memcheck_phone_hard";

		/**
		* Boolean indicating whether restarting the phone process due to
		* memory checks is enabled.
		* @hide
		*/
		public static final String MEMCHECK_PHONE_ENABLED = "memcheck_phone_enabled";

		/**
		* First time during the day it is okay to kill processes
		* or reboot the device due to low memory situations. This number is
		* in seconds since midnight.
		* @hide
		*/
		public static final String MEMCHECK_EXEC_START_TIME = "memcheck_exec_start_time";

		/**
		* Last time during the day it is okay to kill processes
		* or reboot the device due to low memory situations. This number is
		* in seconds since midnight.
		* @hide
		*/
		public static final String MEMCHECK_EXEC_END_TIME = "memcheck_exec_end_time";

		/**
		* How long the screen must have been off in order to kill processes
		* or reboot. This number is in seconds. A value of -1 means to
		* entirely disregard whether the screen is on.
		* @hide
		*/
		public static final String MEMCHECK_MIN_SCREEN_OFF = "memcheck_min_screen_off";

		/**
		* How much time there must be until the next alarm in order to kill processes
		* or reboot. This number is in seconds. Note: this value must be
		* smaller than {@link #MEMCHECK_RECHECK_INTERVAL} or else it will
		* always see an alarm scheduled within its time.
		* @hide
		*/
		public static final String MEMCHECK_MIN_ALARM = "memcheck_min_alarm";

		/**
		* How frequently to check whether it is a good time to restart things,
		* if the device is in a bad state. This number is in seconds. Note:
		* this value must be larger than {@link #MEMCHECK_MIN_ALARM} or else
		* the alarm to schedule the recheck will always appear within the
		* minimum "do not execute now" time.
		* @hide
		*/
		public static final String MEMCHECK_RECHECK_INTERVAL = "memcheck_recheck_interval";

		/**
		* How frequently (in DAYS) to reboot the device. If 0, no reboots
		* will occur.
		* @hide
		*/
		public static final String REBOOT_INTERVAL = "reboot_interval";

		/**
		* First time during the day it is okay to force a reboot of the
		* device (if REBOOT_INTERVAL is set). This number is
		* in seconds since midnight.
		* @hide
		*/
		public static final String REBOOT_START_TIME = "reboot_start_time";

		/**
		* The window of time (in seconds) after each REBOOT_INTERVAL in which
		* a reboot can be executed. If 0, a reboot will always be executed at
		* exactly the given time. Otherwise, it will only be executed if
		* the device is idle within the window.
		* @hide
		*/
		public static final String REBOOT_WINDOW = "reboot_window";

		/**
		* @hide
		*/
		@@ -2677,117 +2804,6 @@ public final class Settings {
		*/
		public static final String MARKET_FORCE_CHECKIN = "market_force_checkin";

		/**
		* How frequently (in seconds) to check the memory status of the
		* device.
		*/
		public static final String MEMCHECK_INTERVAL = "memcheck_interval";

		/**
		* Max frequency (in seconds) to log memory check stats, in realtime
		* seconds. This allows for throttling of logs when the device is
		* running for large amounts of time.
		*/
		public static final String MEMCHECK_LOG_REALTIME_INTERVAL =
		"memcheck_log_realtime_interval";

		/**
		* Boolean indicating whether rebooting due to system memory checks
		* is enabled.
		*/
		public static final String MEMCHECK_SYSTEM_ENABLED = "memcheck_system_enabled";

		/**
		* How many bytes the system process must be below to avoid scheduling
		* a soft reboot. This reboot will happen when it is next determined
		* to be a good time.
		*/
		public static final String MEMCHECK_SYSTEM_SOFT_THRESHOLD = "memcheck_system_soft";

		/**
		* How many bytes the system process must be below to avoid scheduling
		* a hard reboot. This reboot will happen immediately.
		*/
		public static final String MEMCHECK_SYSTEM_HARD_THRESHOLD = "memcheck_system_hard";

		/**
		* How many bytes the phone process must be below to avoid scheduling
		* a soft restart. This restart will happen when it is next determined
		* to be a good time.
		*/
		public static final String MEMCHECK_PHONE_SOFT_THRESHOLD = "memcheck_phone_soft";

		/**
		* How many bytes the phone process must be below to avoid scheduling
		* a hard restart. This restart will happen immediately.
		*/
		public static final String MEMCHECK_PHONE_HARD_THRESHOLD = "memcheck_phone_hard";

		/**
		* Boolean indicating whether restarting the phone process due to
		* memory checks is enabled.
		*/
		public static final String MEMCHECK_PHONE_ENABLED = "memcheck_phone_enabled";

		/**
		* First time during the day it is okay to kill processes
		* or reboot the device due to low memory situations. This number is
		* in seconds since midnight.
		*/
		public static final String MEMCHECK_EXEC_START_TIME = "memcheck_exec_start_time";

		/**
		* Last time during the day it is okay to kill processes
		* or reboot the device due to low memory situations. This number is
		* in seconds since midnight.
		*/
		public static final String MEMCHECK_EXEC_END_TIME = "memcheck_exec_end_time";

		/**
		* How long the screen must have been off in order to kill processes
		* or reboot. This number is in seconds. A value of -1 means to
		* entirely disregard whether the screen is on.
		*/
		public static final String MEMCHECK_MIN_SCREEN_OFF = "memcheck_min_screen_off";

		/**
		* How much time there must be until the next alarm in order to kill processes
		* or reboot. This number is in seconds. Note: this value must be
		* smaller than {@link #MEMCHECK_RECHECK_INTERVAL} or else it will
		* always see an alarm scheduled within its time.
		*/
		public static final String MEMCHECK_MIN_ALARM = "memcheck_min_alarm";

		/**
		* How frequently to check whether it is a good time to restart things,
		* if the device is in a bad state. This number is in seconds. Note:
		* this value must be larger than {@link #MEMCHECK_MIN_ALARM} or else
		* the alarm to schedule the recheck will always appear within the
		* minimum "do not execute now" time.
		*/
		public static final String MEMCHECK_RECHECK_INTERVAL = "memcheck_recheck_interval";

		/**
		* How frequently (in DAYS) to reboot the device. If 0, no reboots
		* will occur.
		*/
		public static final String REBOOT_INTERVAL = "reboot_interval";

		/**
		* First time during the day it is okay to force a reboot of the
		* device (if REBOOT_INTERVAL is set). This number is
		* in seconds since midnight.
		*/
		public static final String REBOOT_START_TIME = "reboot_start_time";

		/**
		* The window of time (in seconds) after each REBOOT_INTERVAL in which
		* a reboot can be executed. If 0, a reboot will always be executed at
		* exactly the given time. Otherwise, it will only be executed if
		* the device is idle within the window.
		*/
		public static final String REBOOT_WINDOW = "reboot_window";

		/**
		* The minimum version of the server that is required in order for the device to accept
		* the server's recommendations about the initial sync settings to use. When this is unset,

services/java/com/android/server/Watchdog.java

+33 −33

Original line number	Diff line number	Diff line
		@@ -97,16 +97,16 @@ public class Watchdog extends Thread {
		long mLastMemCheckRealtime = -(MEMCHECK_DEFAULT_LOG_REALTIME_INTERVAL*1000);
		boolean mHaveGlobalPss;
		final MemMonitor mSystemMemMonitor = new MemMonitor("system",
		Settings.Gservices.MEMCHECK_SYSTEM_ENABLED,
		Settings.Gservices.MEMCHECK_SYSTEM_SOFT_THRESHOLD,
		Settings.Secure.MEMCHECK_SYSTEM_ENABLED,
		Settings.Secure.MEMCHECK_SYSTEM_SOFT_THRESHOLD,
		MEMCHECK_DEFAULT_SYSTEM_SOFT_THRESHOLD,
		Settings.Gservices.MEMCHECK_SYSTEM_HARD_THRESHOLD,
		Settings.Secure.MEMCHECK_SYSTEM_HARD_THRESHOLD,
		MEMCHECK_DEFAULT_SYSTEM_HARD_THRESHOLD);
		final MemMonitor mPhoneMemMonitor = new MemMonitor("com.android.phone",
		Settings.Gservices.MEMCHECK_PHONE_ENABLED,
		Settings.Gservices.MEMCHECK_PHONE_SOFT_THRESHOLD,
		Settings.Secure.MEMCHECK_PHONE_ENABLED,
		Settings.Secure.MEMCHECK_PHONE_SOFT_THRESHOLD,
		MEMCHECK_DEFAULT_PHONE_SOFT_THRESHOLD,
		Settings.Gservices.MEMCHECK_PHONE_HARD_THRESHOLD,
		Settings.Secure.MEMCHECK_PHONE_HARD_THRESHOLD,
		MEMCHECK_DEFAULT_PHONE_HARD_THRESHOLD);

		final Calendar mCalendar = Calendar.getInstance();
		@@ -161,11 +161,11 @@ public class Watchdog extends Thread {
		}

		void retrieveSettings(ContentResolver resolver) {
		mSoftThreshold = Settings.Gservices.getInt(
		mSoftThreshold = Settings.Secure.getInt(
		resolver, mSoftSetting, mSoftThreshold);
		mHardThreshold = Settings.Gservices.getInt(
		mHardThreshold = Settings.Secure.getInt(
		resolver, mHardSetting, mHardThreshold);
		mEnabled = Settings.Gservices.getInt(
		mEnabled = Settings.Secure.getInt(
		resolver, mEnabledSetting, 0) != 0;
		}

		@@ -255,8 +255,8 @@ public class Watchdog extends Thread {

		// See if we should force a reboot.
		int rebootInterval = mReqRebootInterval >= 0
		? mReqRebootInterval : Settings.Gservices.getInt(
		mResolver, Settings.Gservices.REBOOT_INTERVAL,
		? mReqRebootInterval : Settings.Secure.getInt(
		mResolver, Settings.Secure.REBOOT_INTERVAL,
		REBOOT_DEFAULT_INTERVAL);
		if (mRebootInterval != rebootInterval) {
		mRebootInterval = rebootInterval;
		@@ -266,8 +266,8 @@ public class Watchdog extends Thread {
		}

		// See if we should check memory conditions.
		long memCheckInterval = Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_INTERVAL,
		long memCheckInterval = Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_INTERVAL,
		MEMCHECK_DEFAULT_INTERVAL) * 1000;
		if ((mLastMemCheckTime+memCheckInterval) < now) {
		// It is now time to collect pss information. This
		@@ -279,8 +279,8 @@ public class Watchdog extends Thread {
		collectMemory();
		mHavePss = true;

		long memCheckRealtimeInterval = Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_LOG_REALTIME_INTERVAL,
		long memCheckRealtimeInterval = Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_LOG_REALTIME_INTERVAL,
		MEMCHECK_DEFAULT_LOG_REALTIME_INTERVAL) * 1000;
		long realtimeNow = SystemClock.elapsedRealtime();
		if ((mLastMemCheckRealtime+memCheckRealtimeInterval) < realtimeNow) {
		@@ -468,8 +468,8 @@ public class Watchdog extends Thread {
		long curTime;
		long nextTime = 0;

		long recheckInterval = Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_RECHECK_INTERVAL,
		long recheckInterval = Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_RECHECK_INTERVAL,
		MEMCHECK_DEFAULT_RECHECK_INTERVAL) * 1000;

		mSystemMemMonitor.retrieveSettings(mResolver);
		@@ -586,8 +586,8 @@ public class Watchdog extends Thread {

		void checkReboot(boolean fromAlarm) {
		int rebootInterval = mReqRebootInterval >= 0 ? mReqRebootInterval
		: Settings.Gservices.getInt(
		mResolver, Settings.Gservices.REBOOT_INTERVAL,
		: Settings.Secure.getInt(
		mResolver, Settings.Secure.REBOOT_INTERVAL,
		REBOOT_DEFAULT_INTERVAL);
		mRebootInterval = rebootInterval;
		if (rebootInterval <= 0) {
		@@ -598,16 +598,16 @@ public class Watchdog extends Thread {
		}

		long rebootStartTime = mReqRebootStartTime >= 0 ? mReqRebootStartTime
		: Settings.Gservices.getLong(
		mResolver, Settings.Gservices.REBOOT_START_TIME,
		: Settings.Secure.getLong(
		mResolver, Settings.Secure.REBOOT_START_TIME,
		REBOOT_DEFAULT_START_TIME);
		long rebootWindowMillis = (mReqRebootWindow >= 0 ? mReqRebootWindow
		: Settings.Gservices.getLong(
		mResolver, Settings.Gservices.REBOOT_WINDOW,
		: Settings.Secure.getLong(
		mResolver, Settings.Secure.REBOOT_WINDOW,
		REBOOT_DEFAULT_WINDOW)) * 1000;
		long recheckInterval = (mReqRecheckInterval >= 0 ? mReqRecheckInterval
		: Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_RECHECK_INTERVAL,
		: Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_RECHECK_INTERVAL,
		MEMCHECK_DEFAULT_RECHECK_INTERVAL)) * 1000;

		retrieveBrutalityAmount();
		@@ -688,12 +688,12 @@ public class Watchdog extends Thread {
		*/
		void retrieveBrutalityAmount() {
		mMinScreenOff = (mReqMinScreenOff >= 0 ? mReqMinScreenOff
		: Settings.Gservices.getInt(
		mResolver, Settings.Gservices.MEMCHECK_MIN_SCREEN_OFF,
		: Settings.Secure.getInt(
		mResolver, Settings.Secure.MEMCHECK_MIN_SCREEN_OFF,
		MEMCHECK_DEFAULT_MIN_SCREEN_OFF)) * 1000;
		mMinAlarm = (mReqMinNextAlarm >= 0 ? mReqMinNextAlarm
		: Settings.Gservices.getInt(
		mResolver, Settings.Gservices.MEMCHECK_MIN_ALARM,
		: Settings.Secure.getInt(
		mResolver, Settings.Secure.MEMCHECK_MIN_ALARM,
		MEMCHECK_DEFAULT_MIN_ALARM)) * 1000;
		}

		@@ -737,11 +737,11 @@ public class Watchdog extends Thread {

		mMemcheckLastTime = curTime;

		long memcheckExecStartTime = Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_EXEC_START_TIME,
		long memcheckExecStartTime = Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_EXEC_START_TIME,
		MEMCHECK_DEFAULT_EXEC_START_TIME);
		long memcheckExecEndTime = Settings.Gservices.getLong(
		mResolver, Settings.Gservices.MEMCHECK_EXEC_END_TIME,
		long memcheckExecEndTime = Settings.Secure.getLong(
		mResolver, Settings.Secure.MEMCHECK_EXEC_END_TIME,
		MEMCHECK_DEFAULT_EXEC_END_TIME);

		mMemcheckExecEndTime = computeCalendarTime(mCalendar, curTime,