From 61392335a426e38f089f8659110f8f08fbec10a3 Mon Sep 17 00:00:00 2001
From: hmz007 <hmz007@gmail.com>
Date: Thu, 5 Aug 2021 20:11:12 +0800
Subject: [PATCH] android: sysui: Support to keep user rotation pref

Signed-off-by: hmz007 <hmz007@gmail.com>
---
 .../src/com/android/systemui/navigationbar/NavigationBar.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
index a8ea98a1c8e..70b675a6f1d 100644
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
@@ -829,7 +829,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
 
             // Reset user rotation pref to match that of the WindowManager if starting in locked
             // mode. This will automatically happen when switching from auto-rotate to locked mode.
-            if (display != null && rotationButtonController.isRotationLocked()) {
+            final boolean resetRotation = !SystemProperties.getBoolean("ro.vendor.user_rotation", false);
+            if (resetRotation && display != null && rotationButtonController.isRotationLocked()) {
                 rotationButtonController.setRotationLockedAtAngle(display.getRotation());
             }
         } else {