From 0e9955c3f7ae944777928581076cabd6169f7497 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Mon, 30 Sep 2024 13:18:33 +0000 Subject: Fix lockscreen.rot_override precedence Since config_enableLockScreenRotation was introduced, the override only allowed forcing keyguard rotation *on*. Not *off* which can also be useful depending on the device-under-test. Bug: 355144756 Change-Id: Ide938ee9baff0155f4f742cafda5a14f613e8e96 Flag: EXEMPT adjusting a legacy flag --- .../systemui/statusbar/policy/KeyguardStateControllerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index c256e6430af9..4a8bebe46af4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -283,8 +283,9 @@ public class KeyguardStateControllerImpl implements KeyguardStateController { @Override public boolean isKeyguardScreenRotationAllowed() { - return SystemProperties.getBoolean("lockscreen.rot_override", false) - || mContext.getResources().getBoolean(R.bool.config_enableLockScreenRotation) + final boolean configEnabled = + mContext.getResources().getBoolean(R.bool.config_enableLockScreenRotation); + return SystemProperties.getBoolean("lockscreen.rot_override", configEnabled) || mFeatureFlags.isEnabled(LOCKSCREEN_ENABLE_LANDSCAPE); } -- cgit v1.2.3-59-g8ed1b