commit be9bd5dafe05bb8a8ad5d94c14f63178f155afe2
author Matt Buckley <mattbuckley@google.com> Thu Oct 12 19:37:36 2023 +0000
committer Matt Buckley <mattbuckley@google.com> Fri Oct 13 18:17:37 2023 +0000
tree 72afa74629e8b0e849b22db45ee64d120f86f0ce
parent a25ad0514e64eda1e2c6691c301849be6f2612c1

[DO NOT MERGE] Revert "Mitigation for mass GC deletion"

Revert submission 24828717

Reason for revert: performance concerns

Reverted changes: /q/submissionid:24828717

Bug: 300360668
Bug: 302620048

Change-Id: Iefb7488f6e100ca7cbb0d43337e5830860ebebe5

libs/hwui/renderthread/HintSessionWrapper.h

diff --git a/libs/hwui/renderthread/HintSessionWrapper.h b/libs/hwui/renderthread/HintSessionWrapper.h
index 36e91ea..f8b876e 100644
--- a/libs/hwui/renderthread/HintSessionWrapper.h
+++ b/libs/hwui/renderthread/HintSessionWrapper.h
@@ -19,7 +19,6 @@
 #include <android/performance_hint.h>
 
 #include <future>
-#include <optional>
 
 #include "utils/TimeUtils.h"
 
@@ -28,8 +27,6 @@
 
 namespace renderthread {
 
-class RenderThread;
-
 class HintSessionWrapper {
 public:
     friend class HintSessionWrapperTests;
@@ -43,15 +40,10 @@
     void sendLoadIncreaseHint();
     bool init();
     void destroy();
-    bool alive();
-    nsecs_t getLastUpdate();
-    void delayedDestroy(renderthread::RenderThread& rt, nsecs_t delay,
-                        std::shared_ptr<HintSessionWrapper> wrapperPtr);
 
 private:
     APerformanceHintSession* mHintSession = nullptr;
-    // This needs to work concurrently for testing
-    std::optional<std::shared_future<APerformanceHintSession*>> mHintSessionFuture;
+    std::future<APerformanceHintSession*> mHintSessionFuture;
 
     int mResetsSinceLastReport = 0;
     nsecs_t mLastFrameNotification = 0;