summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vishnu Nair <vishnun@google.com> 2022-01-05 16:26:17 -0800
committer Vishnu Nair <vishnun@google.com> 2022-01-06 23:08:32 +0000
commit1b068c44b3cc42c7b74d10cb52e0fe5128337746 (patch)
tree7e98b59c644fd106de27557e7c91f6f12feb9715
parent34d9f068d1f716e5fe69d713fab3b4b5b7ac8c33 (diff)
SurfaceView: Synchronize visibility changes with VRI frame
There is a flicker in wallpaper picker due to a recent change where SurfaceView creation changes were synchronized with VRI frame. This breaks wallpaper picker because wallpaper picker doesn't actually draw into the SV surface, instead they attach a surface package. The current implementation meant the SurfacePackage would be visible before it was scaled correctly. This fix applies the visibility changes along with the scaling changes. Test: steps in b/211945947 Fixes: 211945947 Change-Id: I4e5107ac2caf634429e1bec3201fdcaa8f5f92bc (cherry picked from commit 230677e7b3b8ae27e337eefbabcbedda2d5ffcfd)
-rw-r--r--core/java/android/view/SurfaceView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 4c7bfd252657..463ec2c04308 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -975,9 +975,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
mParentSurfaceSequenceId = viewRoot.getSurfaceSequenceId();
if (mViewVisibility) {
- mTmpTransaction.show(mSurfaceControl);
+ geometryTransaction.show(mSurfaceControl);
} else {
- mTmpTransaction.hide(mSurfaceControl);
+ geometryTransaction.hide(mSurfaceControl);
}
if (mSurfacePackage != null) {