Update to ToT RemoteCompose

Bug: 339721781
Flag: EXEMPT External Libraries
Test: in GoB
Change-Id: I750d0da0bbe843fcd978f8e5efd8d4b8558bb439

3 files changed, 8 insertions, 2 deletions

diff --git a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
index fb560a568a9c..26b0d11955d2 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java
@@ -62,7 +62,7 @@ public class CoreDocument {
 
     // We also keep a more fine-grained BUILD number, exposed as
     // ID_API_LEVEL = DOCUMENT_API_LEVEL + BUILD
-    static final float BUILD = 0.1f;
+    static final float BUILD = 0.2f;
 
     @NonNull ArrayList<Operation> mOperations = new ArrayList<>();
 
@@ -1058,7 +1058,7 @@ public class CoreDocument {
      * @param theme the theme we want to use for this document.
      */
     public void paint(@NonNull RemoteContext context, int theme) {
-        context.getLastOpCount();
+        context.clearLastOpCount();
         context.getPaintContext().clearNeedsRepaint();
         context.loadFloat(RemoteContext.ID_DENSITY, context.getDensity());
         context.mMode = RemoteContext.ContextMode.UNSET;
diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
index cd26198caf2e..43f8ea7dc78f 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java
@@ -528,6 +528,7 @@ public class RemoteComposeState implements CollectionsAccess {
 
     public void setContext(@NonNull RemoteContext context) {
         mRemoteContext = context;
+        mRemoteContext.clearLastOpCount();
     }
 
     public void updateObject(int id, @NonNull Object value) {
diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java
index ec336633e960..23c362830713 100644
--- a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java
+++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java
@@ -743,4 +743,9 @@ public abstract class RemoteContext {
         mOpCount = 0;
         return count;
     }
+
+    /** Explicitly clear the operation counter */
+    public void clearLastOpCount() {
+        mOpCount = 0;
+    }
 }