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

Merge commit 'e0b767153ef978a4ca841c9891074717fd979400' into manual_merge_e0b7671

Browse Source 
Change-Id: I6b6810db33e4b244cc872abd69d5b18a90547b35
This commit is contained in:
Winson
2016-09-08 19:12:45 -07:00
parent 14ed6af85f e0b767153e
commit 9bf04523b4
12 changed files with 82 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6405,21 +6405,6 @@ public final class Settings {
*/
public static final String WEB_ACTION_ENABLED = "web_action_enabled";
/**
* The uptime when tasks were last persisted. This is used to adjust the previous task
* active times to be relative to the current boot time.
* @hide
*/
public static final String TASK_PERSISTER_LAST_WRITE_UPTIME = "task_persister_write_uptime";
/**
* Used by Overview to keep track of the last visible task's active time to determine what
* should tasks be visible.
* @hide
*/
public static final String OVERVIEW_LAST_VISIBLE_TASK_ACTIVE_UPTIME =
"overview_last_visible_task_active_uptime";
/**
* This are the settings to be backed up.
*