Commit 6ba00728 authored Oct 07, 2022 by Alec Mouri

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

parent e3af2b62

core/java/android/view/SurfaceView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}