Merge "Introduce a Setting for auto revoke teamfood settings" into rvc-dev am:... (0472e3b7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14203,6 +14203,23 @@ public final class Settings {
	public static final String APPOP_HISTORY_PARAMETERS =		public static final String APPOP_HISTORY_PARAMETERS =
	"appop_history_parameters";		"appop_history_parameters";

			/**
			* Auto revoke parameters. These parameters are represented by
			* a comma-delimited key-value list.
			*
			* <pre>
			* enabledForPreRApps (bolean)
			* unusedThresholdMs (long)
			* checkFrequencyMs (long)
			* </pre>
			*
			* Ex: "enabledForPreRApps=false,unusedThresholdMs=7776000000,checkFrequencyMs=1296000000"
			*
			* @hide
			*/
			public static final String AUTO_REVOKE_PARAMETERS =
			"auto_revoke_parameters";

	/**		/**
	* Delay for sending ACTION_CHARGING after device is plugged in.		* Delay for sending ACTION_CHARGING after device is plugged in.
	* This is used as an override for constants defined in BatteryStatsImpl for		* This is used as an override for constants defined in BatteryStatsImpl for

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -575,6 +575,7 @@ public class SettingsBackupTest {
	Settings.Global.APPOP_HISTORY_MODE,		Settings.Global.APPOP_HISTORY_MODE,
	Settings.Global.APPOP_HISTORY_INTERVAL_MULTIPLIER,		Settings.Global.APPOP_HISTORY_INTERVAL_MULTIPLIER,
	Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,		Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,
			Settings.Global.AUTO_REVOKE_PARAMETERS,
	Settings.Global.ENABLE_RADIO_BUG_DETECTION,		Settings.Global.ENABLE_RADIO_BUG_DETECTION,
	Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,		Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,
	Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,		Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,