diff options
| author | 2019-12-18 05:21:37 +0000 | |
|---|---|---|
| committer | 2019-12-18 05:21:37 +0000 | |
| commit | b4bb59a9f464a3b8b034061bd0b6eaa9dadcbd6c (patch) | |
| tree | 9b3c0db718f0efc1c2376bc0620b1bb18b205f2d | |
| parent | a07f13195b16238aaf30e9804c5ff115f145a9fd (diff) | |
| parent | 504df9427ef8c1f74e3037fc403f9c523d3c8c17 (diff) | |
Merge "Removed the DEFAULT_USER_ID_TO_BOOT_INTO settings property - it's not used."
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e73a74f69dee..f4e2329797b2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13653,13 +13653,6 @@ public final class Settings { public static final String KERNEL_CPU_THREAD_READER = "kernel_cpu_thread_reader"; /** - * 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. diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 5d0db01cd5ae..19ff2444e6ca 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -215,7 +215,6 @@ 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, |