diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-10-12 09:59:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 09:59:11 -0700 |
| commit | 421648ed06a2c944bc6a5fa866d461761533005b (patch) | |
| tree | cfd987f4c418d327a3deaa0e65ceb1e1b3960107 | |
| parent | c0c394ee053c1b62da58247c431c20d5939c4ada (diff) | |
| parent | aee2687e613787f044e3f02cc99342a1ee79a739 (diff) | |
| download | frameworks_base-421648ed06a2c944bc6a5fa866d461761533005b.zip frameworks_base-421648ed06a2c944bc6a5fa866d461761533005b.tar.gz frameworks_base-421648ed06a2c944bc6a5fa866d461761533005b.tar.bz2 | |
Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
| -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 }; /** |