diff options
| author | 2017-03-06 21:56:02 +0000 | |
|---|---|---|
| committer | 2017-03-06 21:56:07 +0000 | |
| commit | 25e333cb3ca65dde8d3b448d119180918d2f7356 (patch) | |
| tree | 377abb4013f4918da9d9dc6d538c6d058cfd268c | |
| parent | a485f71fd77302f31daa0d6ae29f6802a61eddcf (diff) | |
| parent | 5bce494b93f83bec7fd59ce8e11774264631fcc4 (diff) | |
Merge "Add VR_DISPLAY_MODE settings to be backed up."
| -rwxr-xr-x | core/java/android/provider/Settings.java | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c4a5be7f1ea6..73d61c3cd1f0 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6998,7 +6998,8 @@ public final class Settings { DOZE_PULSE_ON_DOUBLE_TAP, NFC_PAYMENT_DEFAULT_COMPONENT, AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, - ASSIST_GESTURE_ENABLED + ASSIST_GESTURE_ENABLED, + VR_DISPLAY_MODE }; /** diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 105a351456dc..9a64507fc7ca 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -470,7 +470,6 @@ public class SettingsBackupTest { Settings.Secure.USER_SETUP_COMPLETE, Settings.Secure.VOICE_INTERACTION_SERVICE, Settings.Secure.VOICE_RECOGNITION_SERVICE, - Settings.Secure.VR_DISPLAY_MODE, // Candidate? Settings.Secure.WEB_ACTION_ENABLED); @Test |