commit 122716839eae431fcf33f3d906d016bf63cce9a6
author Matt Buckley <mattbuckley@google.com> Fri Dec 02 22:04:34 2022 +0000
committer Matt Buckley <mattbuckley@google.com> Fri Dec 02 22:04:34 2022 +0000
tree 5f14b143a8e0226437b3ee0fd99d51facccda11e
parent 7c5817e876c62f3237a2b94622c55b21340e846e

Tie notifyFramePending to load reset more explicitly

Cleans up some logic around notifyFramePending sending the load change
hint; they should have always happened together but apparently weren't.

Bug: b/260663188
Test: manual
Change-Id: I7f643a31c9a6773426386bb3be2de59a4efd45ac

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 09a9d46..65ef671 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2323,7 +2323,6 @@
      */
     void notifyRendererOfFramePending() {
         if (mAttachInfo.mThreadedRenderer != null) {
-            mAttachInfo.mThreadedRenderer.notifyCallbackPending();
             mAttachInfo.mThreadedRenderer.notifyFramePending();
         }
     }

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 64839d0..78ae5cf 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -475,6 +475,7 @@
 void CanvasContext::notifyFramePending() {
     ATRACE_CALL();
     mRenderThread.pushBackFrameCallback(this);
+    sendLoadResetHint();
 }
 
 void CanvasContext::draw() {