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

Commit 86ef4adc authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Removed Settings.Global.LAST_ACTIVE_USER_ID." into rvc-dev am:... 

Merge "Merge "Removed Settings.Global.LAST_ACTIVE_USER_ID." into rvc-dev am: 3bf4ec13 am: 0a8e4234 am: 7bac8096" into rvc-qpr-dev-plus-aosp
parents 90858cc6 467b6410

core/java/android/provider/Settings.java

+0 −9
Original line number Diff line number Diff line
@@ -14242,15 +14242,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.

























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -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,