diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-10-11 13:53:30 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-10-12 09:46:43 -0700 |
| commit | aee2687e613787f044e3f02cc99342a1ee79a739 (patch) | |
| tree | 2bc0c6779ae3be2275bde01879d3ec8e90d5de80 | |
| parent | 99f36683a4f2c218d52922ae7c2a0c0b3f2890ed (diff) | |
| download | frameworks_base-aee2687e613787f044e3f02cc99342a1ee79a739.zip frameworks_base-aee2687e613787f044e3f02cc99342a1ee79a739.tar.gz frameworks_base-aee2687e613787f044e3f02cc99342a1ee79a739.tar.bz2 | |
Backup owner info as part of settings backup. DO NOT MERGE.
[Cherry pick from master]
Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO
Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index bc05078..3d2a3ce 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4087,7 +4087,9 @@ public final class Settings { MOUNT_UMS_AUTOSTART, MOUNT_UMS_PROMPT, MOUNT_UMS_NOTIFY_ENABLED, - UI_NIGHT_MODE + UI_NIGHT_MODE, + LOCK_SCREEN_OWNER_INFO, + LOCK_SCREEN_OWNER_INFO_ENABLED }; /** |