commit 6c2c619d355f6cdd68d6ad04bfe86590bb1062f6
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 13 16:06:49 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 13 16:06:49 2022 +0000
tree 0e0e79c640a3e3908d1a56718e7f2613e4e0d2da
parent 19d43e05116605070a997207b0a3ab84dd490abc
parent 70d63456d35cc6e90014b83ef0e99cd203cebc1a

Merge "Add non null check on mViewPager" into tm-dev

src/com/android/launcher3/states/RotationHelper.java

diff --git a/src/com/android/launcher3/states/RotationHelper.java b/src/com/android/launcher3/states/RotationHelper.java
index 8b425da..38b62d4 100644
--- a/src/com/android/launcher3/states/RotationHelper.java
+++ b/src/com/android/launcher3/states/RotationHelper.java
@@ -109,7 +109,7 @@
 
     @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()));