Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1051bbbd authored Feb 07, 2022 by Olivier Gaillard Committed by Android (Google) Code Review Feb 07, 2022

Merge "Add half watchdogs to dropbox and make the watchdog timeout configurable."

parents 8ffeeb86 6fe47695

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -16815,6 +16815,16 @@ public final class Settings {
		public static final String LOW_POWER_STANDBY_ACTIVE_DURING_MAINTENANCE =
		"low_power_standby_active_during_maintenance";

		/**
		* Timeout for the system server watchdog.
		*
		* @see {@link com.android.server.Watchdog}.
		*
		* @hide
		*/
		public static final String WATCHDOG_TIMEOUT_MILLIS =
		"system_server_watchdog_timeout_ms";

		/**
		* Settings migrated from Wear OS settings provider.
		* @hide

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -594,6 +594,7 @@ public class SettingsBackupTest {
		Settings.Global.APP_INTEGRITY_VERIFICATION_TIMEOUT,
		Settings.Global.KEY_CHORD_POWER_VOLUME_UP,
		Settings.Global.CLOCKWORK_HOME_READY,
		Settings.Global.WATCHDOG_TIMEOUT_MILLIS,
		Settings.Global.Wearable.BATTERY_SAVER_MODE,
		Settings.Global.Wearable.COMBINED_LOCATION_ENABLED,
		Settings.Global.Wearable.HAS_PAY_TOKENS,

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

+246 −120

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/SystemServer.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1504,6 +1504,10 @@ public final class SystemServer implements Dumpable {
		SQLiteCompatibilityWalFlags.reset();
		t.traceEnd();

		t.traceBegin("UpdateWatchdogTimeout");
		Watchdog.getInstance().registerSettingsObserver(context);
		t.traceEnd();

		// Records errors and logs, for example wtf()
		// Currently this service indirectly depends on SettingsProvider so do this after
		// InstallSystemProviders.