From 5bce494b93f83bec7fd59ce8e11774264631fcc4 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Mon, 27 Feb 2017 11:50:18 -0800 Subject: Add VR_DISPLAY_MODE settings to be backed up. Test: use adb backup to backup/restore and verify value is carried over. Bug: 34437367 Change-Id: Icefc6bb1ae2f6410580214d0fe4fe4bd40038f46 --- core/java/android/provider/Settings.java | 3 ++- 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 40de928b49bb..bf34ff0ca903 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6992,7 +6992,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 da6a294fe8bb..5ffe378f5eab 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -468,7 +468,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 -- cgit v1.2.3-59-g8ed1b