Merge "MASTER - Add signal for last active user in global settings." (98bb3f5c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -13308,6 +13308,23 @@ public final class Settings {
		* @hide
		*/
		public static final String BINDER_CALLS_STATS = "binder_calls_stats";

		/**
		* Default user id to boot into. They map to user ids, for example, 10, 11, 12.
		*
		* @hide
		*/
		public static final String DEFAULT_USER_ID_TO_BOOT_INTO = "default_boot_into_user_id";

		/**
		* Persistent user id that is last logged in to.
		*
		* They map to user ids, for example, 10, 11, 12.
		*
		* @hide
		*/
		public static final String LAST_ACTIVE_USER_ID = "last_active_persistent_user_id";

		}

		/**

+2 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,7 @@ public class SettingsBackupTest {
		Settings.Global.DEFAULT_DNS_SERVER,
		Settings.Global.DEFAULT_INSTALL_LOCATION,
		Settings.Global.DEFAULT_RESTRICT_BACKGROUND_DATA,
		Settings.Global.DEFAULT_USER_ID_TO_BOOT_INTO,
		Settings.Global.DESK_DOCK_SOUND,
		Settings.Global.DESK_UNDOCK_SOUND,
		Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT,
		@@ -273,6 +274,7 @@ public class SettingsBackupTest {
		Settings.Global.KEEP_PROFILE_IN_BACKGROUND,
		Settings.Global.LANG_ID_UPDATE_CONTENT_URL,
		Settings.Global.LANG_ID_UPDATE_METADATA_URL,
		Settings.Global.LAST_ACTIVE_USER_ID,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,
		Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,