From 6ba00728437575d0e3b0c5389cf0f80497631477 Mon Sep 17 00:00:00 2001
From: Alec Mouri <alecmouri@google.com>
Date: Fri, 7 Oct 2022 01:40:52 +0000
Subject: [PATCH] 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
---
 core/java/android/view/SurfaceView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 9075de13c4d85..198ac9d81ce82 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;
     }