commit 6b727e57c69a1c96b23c4550cfb5931854362c22
author Robert Carr <racarr@google.com> Mon Mar 11 15:34:19 2019 -0700
committer Robert Carr <racarr@google.com> Thu Mar 21 09:29:59 2019 -0700
tree 6f691bd3bba2fcffb7c965dd2d2b3f8ae3d77e13
parent 29fe58a6194b202a98bfbbffb4f548806c09d4e1

SurfaceView: Only show background when behind ViewRoot.

The old implementation of the SurfaceView background didn't show
when the Surface was in front of the  ViewRoot surface, and the new one does.
This is causing problems with apps that float invisible SurfaceViews on top
of themselves and with apps that don't implement draw notification. Here we restore
the old behavior.

Bug: 123920952
Bug: 115969839
Test: Manual
Change-Id: I12a6f3910551ba0fa2ab71a37475a9b78cf384b6

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index ee8d663..e931448 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -491,7 +491,7 @@
         if (mBackgroundControl == null) {
             return;
         }
-        if ((mSurfaceFlags & SurfaceControl.OPAQUE) != 0) {
+        if ((mSubLayer > 0) && ((mSurfaceFlags & SurfaceControl.OPAQUE) != 0)) {
             mBackgroundControl.show();
             mBackgroundControl.setLayer(Integer.MIN_VALUE);
         } else {