commit 335677493d7cf19bf8bcbe9d61b902562c2c6b0a
author Tyler Freeman <fuego@google.com> Tue Oct 31 01:55:51 2023 +0000
committer Tyler Freeman <fuego@google.com> Tue Nov 07 22:49:21 2023 +0000
tree a79df1d9f43106572c833afe8c8347d6cc5ed733
parent 417accdcaac72dffce9039c971cb867fcf279653

fix(force invert): don't let devs opt-out of force dark when force invert is on

Bug: 282821643
Test: manual??
Change-Id: I0a3907ede2ad5d0c895ae70d3d1ec47b0902e3b4

libs/hwui/TreeInfo.h

diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h
index ea25f68..88449f3 100644
--- a/libs/hwui/TreeInfo.h
+++ b/libs/hwui/TreeInfo.h
@@ -24,6 +24,7 @@
 #include "Properties.h"
 #include "SkSize.h"
 #include "SkippedFrameInfo.h"
+#include "utils/ForceDark.h"
 #include "utils/Macros.h"
 
 namespace android {
@@ -97,6 +98,7 @@
     bool updateWindowPositions = false;
 
     int disableForceDark;
+    ForceDarkType forceDarkType = ForceDarkType::NONE;
 
     const SkISize screenSize;