commit be73ba8b0f5588c1e3ff18124df293f368830ae5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 16 21:11:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 16 21:11:47 2024 +0000
tree a1f0dd663921b3d3a0359ff7672062da03fa552f
parent 39fab142a2fa745268b49a7ae287e0bb9a35ffc4
parent 0263ec03f904693e6b178286e8d39bf7a40c7d54

Merge "[Bugfix]Modify SurfaceControl setColor callName error." into main am: 0263ec03f9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3261780

Change-Id: I97e292f62ea6329e55ab940942cb6dcf64c66113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/view/SurfaceControl.java

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 0bdb4ad..505a82a 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -3491,7 +3491,7 @@
             checkPreconditions(sc);
             if (SurfaceControlRegistry.sCallStackDebuggingEnabled) {
                 SurfaceControlRegistry.getProcessInstance().checkCallStackDebugging(
-                        "reparent", this, sc,
+                        "setColor", this, sc,
                         "r=" + color[0] + " g=" + color[1] + " b=" + color[2]);
             }
             nativeSetColor(mNativeObject, sc.mNativeObject, color);