From 8206944f26715283a412c897d638bf4cf4bd5f4d Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 28 Jun 2017 19:37:24 +0200
Subject: [PATCH] AOD: Use keyguard screen rotation when dozing

AOD might show even before the keyguard engages. We should still
use the keyguard's screen rotation in that case, instead of the
underlying app's.

Change-Id: I7d69eb11c20e300fbe2565ce10b4c502f14fbdf6
Fixes: 38309993
Test: Enable autorotate, open an app that does not fix rotation, let display timeout, verify always-on display shows in portrait
---
 .../systemui/statusbar/phone/StatusBarWindowManager.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
index 93dc6de1059ad..6104befeb432d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
@@ -138,7 +138,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback, D
     }
 
     private void adjustScreenOrientation(State state) {
-        if (state.isKeyguardShowingAndNotOccluded()) {
+        if (state.isKeyguardShowingAndNotOccluded() || state.dozing) {
             if (mKeyguardScreenRotation) {
                 mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
             } else {