Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Removed Settings.Global.LAST_ACTIVE_USER_ID." into rvc-dev am: 3bf4ec139b am: 0a8e4234ad am: 7bac8096ae" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-04 19:42:29 +00:00
committed by Android (Google) Code Review
parent 90858cc6ae 467b6410f7
commit 86ef4adc56
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

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

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

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