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

Commit b2862a5e authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 86ef4adc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11723878

Change-Id: I405b7290571a985bb0d9c939f4f72d9bbc1ee691
parents 9f809759 86ef4adc

core/java/android/provider/Settings.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -14284,15 +14284,6 @@ public final class Settings { 
         */

         */

        public static final String KERNEL_CPU_THREAD_READER = "kernel_cpu_thread_reader";

        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







         * 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.







         * 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
Original line
Diff line number
Diff line








@@ -316,7 +316,6 @@ public class SettingsBackupTest {









                    Settings.Global.KERNEL_CPU_THREAD_READER,







                    Settings.Global.KERNEL_CPU_THREAD_READER,











                    Settings.Global.LANG_ID_UPDATE_CONTENT_URL,







                    Settings.Global.LANG_ID_UPDATE_CONTENT_URL,











                    Settings.Global.LANG_ID_UPDATE_METADATA_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_INTERVAL_MS,











                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,







                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS,











                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,







                    Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,