commit c562b38cdc3e484aea3f204155917ff0d1e74085
author Christian Göllner <chrisgollner@google.com> Fri Apr 29 14:10:31 2022 +0000
committer Christian Göllner <chrisgollner@google.com> Fri May 06 12:06:35 2022 +0000
tree 227f13993ea4dbbda6e84073bf17a3b1b0d42b63
parent afb021d75e6877cced751ccfa42c4be63dcd1708

Implement backup & restore for the device state based auto rotation setting

- Adds the setting to DeviceSpecificSettings so that it is only restored on the same device
- Prevents the non-device state based setting to be restored if device stated based settings are enabled

Fixes: 196933725
Test: atest SettingsHelperTest
Change-Id: I58163cb70e8136104370ae7c1cdaaa8b7124b853

packages/SettingsProvider/Android.bp

diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp
index f490c87..4a10427 100644
--- a/packages/SettingsProvider/Android.bp
+++ b/packages/SettingsProvider/Android.bp
@@ -32,6 +32,7 @@
     ],
     static_libs: [
         "junit",
+        "SettingsLibDeviceStateRotationLock",
         "SettingsLibDisplayDensityUtils",
     ],
     platform_apis: true,
@@ -55,6 +56,7 @@
     static_libs: [
         "androidx.test.rules",
         "mockito-target-minus-junit4",
+        "SettingsLibDeviceStateRotationLock",
         "SettingsLibDisplayDensityUtils",
         "platform-test-annotations",
         "truth-prebuilt",