Merge changes from topic "forcedark-ignoreoutoutrendernode" into main

* changes:
  fix(force invert): don't let devs opt-out of force dark when force invert is on
  refactor(force invert): use enum/intdef for force dark type in setForceDark() functions

1 files changed, 2 insertions, 0 deletions

diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h
index ea25f68d7170..88449f3a3572 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 @@ public:
     bool updateWindowPositions = false;
 
     int disableForceDark;
+    ForceDarkType forceDarkType = ForceDarkType::NONE;
 
     const SkISize screenSize;