commit 7e71240c2ae6e2981f3e8da52abd7687b86ba99c
author Vishnu Nair <vishnun@google.com> Tue Jan 11 17:05:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 11 17:05:11 2022 +0000
tree 33f29bd1af5763e788820da176ebe2dd1f343c50
parent 8f7da779d1575b87bc078f8f2d40434e8b2b2cb2
parent f3a504e3d6fa427b196cf0ab7f0f13f64091349f

Merge "SurfaceView: Synchronize visibility changes with VRI frame" into sc-v2-dev am: f3a504e3d6

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

Change-Id: Id6057e44ba0a23a85827675b96ce3ea196345867

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index c4ed32ec..0e49cc9 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -966,9 +966,9 @@
             mParentSurfaceSequenceId = viewRoot.getSurfaceSequenceId();
 
             if (mViewVisibility) {
-                mTmpTransaction.show(mSurfaceControl);
+                geometryTransaction.show(mSurfaceControl);
             } else {
-                mTmpTransaction.hide(mSurfaceControl);
+                geometryTransaction.hide(mSurfaceControl);
             }
 
             if (mSurfacePackage != null) {