From 4bf9bc6ab072c5296ff51dd10768e73e989635a5 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 3 Jun 2020 12:32:52 -0700 Subject: [PATCH] Removed Settings.Global.LAST_ACTIVE_USER_ID. This property was only used by Automotive and was added on frameworks/base because it used be accessed by a class on frameworks/opt/services/car, but it's now only accessed under packages/services/car (so it was moved to CarSettings). Test: atest SettingsBackupTest Bug: 156567994 Change-Id: Idaff4a249600517c5250cd3821d75ce85fc9eeee --- core/java/android/provider/Settings.java | 9 --------- .../test/src/android/provider/SettingsBackupTest.java | 1 - 2 files changed, 10 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1b19e1290121b..a8af310e98974 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -14244,15 +14244,6 @@ public final class Settings { */ public static final String KERNEL_CPU_THREAD_READER = "kernel_cpu_thread_reader"; - /** - * 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"; - /** * Whether we've enabled native flags health check on this device. Takes effect on * reboot. The value "1" enables native flags health check; otherwise it's disabled. diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index fa87b62bd73a1..eb7ad72eb1ba1 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -316,7 +316,6 @@ public class SettingsBackupTest { Settings.Global.KERNEL_CPU_THREAD_READER, 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,