summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alec Mouri <alecmouri@google.com> 2022-10-07 01:40:52 +0000
committer Alec Mouri <alecmouri@google.com> 2022-10-07 19:12:35 +0000
commit6ba00728437575d0e3b0c5389cf0f80497631477 (patch)
treebe2f63e4efe12db39b9d788ae827096c4b50e87d
parente3af2b624932ceec3a245c63a70d40146aece8bd (diff)
Fix media overlaying ordering.
Adding alpha support for SurfaceView introduced some state when applying z-ordering in updateSurface(), so that alpha can be applied to the hole punch or the layer. This new state was not updated for media overlays, so fix that. Bug: 250536276 Bug: 249682951 Test: Applications with overlapping video streams overlap in the correct order Test: SurfaceViewTests Change-Id: I2db37178e9ca800f4e39fd793dc2dc7c43ce5bc3
-rw-r--r--core/java/android/view/SurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 9075de13c4d8..198ac9d81ce8 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -576,7 +576,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
* <p>Calling this overrides any previous call to {@link #setZOrderOnTop}.
*/
public void setZOrderMediaOverlay(boolean isMediaOverlay) {
- mSubLayer = isMediaOverlay
+ mRequestedSubLayer = isMediaOverlay
? APPLICATION_MEDIA_OVERLAY_SUBLAYER : APPLICATION_MEDIA_SUBLAYER;
}