From 6cb2feea7e4cf642e7c2f5a21894263ad5a9a73b Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Tue, 8 Oct 2019 11:08:28 +0800 Subject: [PATCH] Remove assist_gesture_enabled related keys from backup list Bug: 142289715 Test: atest & manual Change-Id: Ied7d97d4b4b0955981824d7342aabe74d06a0c1f --- .../src/android/provider/settings/backup/SecureSettings.java | 3 --- .../test/src/android/provider/SettingsBackupTest.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 67062b78e0deb..8c9705753dec2 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -107,9 +107,6 @@ public class SecureSettings { Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, Settings.Secure.FACE_UNLOCK_APP_ENABLED, Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, - Settings.Secure.ASSIST_GESTURE_ENABLED, - Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, - Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED, Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.NOTIFICATION_BADGING, Settings.Secure.NOTIFICATION_DISMISS_RTL, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index ebb9e86e11512..8437eae20637d 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -594,7 +594,10 @@ public class SettingsBackupTest { Settings.Secure.ANR_SHOW_BACKGROUND, Settings.Secure.ASSISTANT, Settings.Secure.ASSIST_DISCLOSURE_ENABLED, + Settings.Secure.ASSIST_GESTURE_ENABLED, Settings.Secure.ASSIST_GESTURE_SENSITIVITY, + Settings.Secure.ASSIST_GESTURE_WAKE_ENABLED, + Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, Settings.Secure.ASSIST_GESTURE_SETUP_COMPLETE, Settings.Secure.ASSIST_SCREENSHOT_ENABLED, Settings.Secure.ASSIST_STRUCTURE_ENABLED,