From 745deffa8ff5f6567280548cedbd8b66c895ced3 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Thu, 10 Jun 2021 11:21:16 -0400
Subject: [PATCH] Backup POWER_BUTTON_LONG_PRESS

Starting with Android 12, start backing up this setting to restore the
user's pref across devices. For users upgrading to a 2021+ device,
they will get the new default (assistant on long-press). If this user
then restores to an older device, they will then get this new behavior
on that device as well, even though it isn't the device default.

Fixes: 189874533
Test: atest SettingsBackupTest
Change-Id: I4b9864045bf12f30da03e3715f5e368bdf48a198
---
 .../src/android/provider/settings/backup/GlobalSettings.java     | 1 +
 .../test/src/android/provider/SettingsBackupTest.java            | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
index c9c3db8a2e27e..eb8196176034c 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
@@ -75,5 +75,6 @@ public class GlobalSettings {
         Settings.Global.USER_DISABLED_HDR_FORMATS,
         Settings.Global.ARE_USER_DISABLED_HDR_FORMATS_ALLOWED,
         Settings.Global.DEVICE_CONFIG_SYNC_DISABLED,
+        Settings.Global.POWER_BUTTON_LONG_PRESS,
     };
 }
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index f538875bf3372..3297937e3e752 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -587,7 +587,6 @@ public class SettingsBackupTest {
                     Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,
                     Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT,
                     Settings.Global.MODEM_STACK_ENABLED_FOR_SLOT,
-                    Settings.Global.POWER_BUTTON_LONG_PRESS,
                     Settings.Global.POWER_BUTTON_VERY_LONG_PRESS,
                     Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, // Temporary for R beta
                     Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER,