From 19d43e05116605070a997207b0a3ab84dd490abc Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 13 May 2022 11:17:05 +0100
Subject: [PATCH] Skip onSharedPreferenceChanged if mIgnoreAutoRotateSettings
 is true in RotationHelper

Test: manual with DeviceProfile changed followed by settings change
Bug: 232081262
Change-Id: Ibc02bbc7fc015db9511960b565e860e6cb5b6246
---
 src/com/android/launcher3/states/RotationHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 8b425daa5e..38b62d466e 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -109,7 +109,7 @@ public class RotationHelper implements OnSharedPreferenceChangeListener,
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
-        if (mDestroyed) return;
+        if (mDestroyed || mIgnoreAutoRotateSettings) return;
         boolean wasRotationEnabled = mHomeRotationEnabled;
         mHomeRotationEnabled = mSharedPrefs.getBoolean(ALLOW_ROTATION_PREFERENCE_KEY,
                 getAllowRotationDefaultValue(mActivity.getDeviceProfile()));