From 36a87acd92285d42a3ab024e8f829062f93b495b Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Tue, 6 Aug 2019 23:59:53 +0800
Subject: [PATCH] OutdoorModeController: Unconditionally enable auto mode on
 HWC2

 * On HWC2, setting "Display mode" to "Automatic" and disabling
   "Automatic outdoor mode" at the same time makes no difference with
   setting "Display mode" to "Off" alone. Obviously this is redundant
   and could confuse the user, so simply ignore the "Automatic outdoor
   mode" setting on HWC2 to reduce redundancy.

Change-Id: I6858571a6b9ded3540fd3d936499878f57a7b3d4
---
 .../platform/internal/display/OutdoorModeController.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
index f25d5afb..fc5e9092 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/OutdoorModeController.java
@@ -249,9 +249,9 @@ public class OutdoorModeController extends LiveDisplayFeature {
     }
 
     boolean isAutomaticOutdoorModeEnabled() {
-        return mUseOutdoorMode &&
+        return mUseOutdoorMode && (mNightDisplayAvailable ||
                 getBoolean(LineageSettings.System.DISPLAY_AUTO_OUTDOOR_MODE,
-                           getDefaultAutoOutdoorMode());
+                           getDefaultAutoOutdoorMode()));
     }
 
     boolean getDefaultAutoOutdoorMode() {