From ff674ee46819c094a68e533689315f8c07ceac6a Mon Sep 17 00:00:00 2001
From: "yu.chen" <yu.chen@mediatek.com>
Date: Tue, 6 Nov 2018 21:03:00 +0800
Subject: [PATCH] DO NOT MERGE Set ContainerLayer for buffer-less surface

The container layers havn't buffers,but the buffer size
may beyond the GPU limit, need set those surface as
container layer

Test: Reboot device, rotate the screen, enter and exit multi window, check the UI is normal
           Dump SF layer and check the container layer is set successfully
Bug: 111164627
Change-Id: I6dd3bcb85ffe890c98ce82f2ef20a1576e8cd440
---
 .../core/java/com/android/server/wm/AppWindowThumbnail.java  | 1 +
 services/core/java/com/android/server/wm/DisplayContent.java | 5 +++--
 .../java/com/android/server/wm/WindowSurfaceController.java  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/AppWindowThumbnail.java b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
index ad92f81f4dde4..bef974ae10817 100644
--- a/services/core/java/com/android/server/wm/AppWindowThumbnail.java
+++ b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
@@ -69,6 +69,7 @@ class AppWindowThumbnail implements Animatable {
                 .setFormat(PixelFormat.TRANSLUCENT)
                 .setMetadata(appToken.windowType,
                         window != null ? window.mOwnerUid : Binder.getCallingUid())
+                .setBufferLayer()
                 .build();
 
         if (SHOW_TRANSACTIONS) {
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 2887e5ef90617..4fdf68e8d7086 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -773,7 +773,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
 
         final SurfaceControl.Builder b = mService.makeSurfaceBuilder(mSession)
                 .setSize(mSurfaceSize, mSurfaceSize)
-                .setOpaque(true);
+                .setOpaque(true)
+                .setContainerLayer(true);
         mWindowingLayer = b.setName("Display Root").build();
         mOverlayLayer = b.setName("Display Overlays").build();
 
@@ -3885,7 +3886,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
         SurfaceSession s = child != null ? child.getSession() : getSession();
         final SurfaceControl.Builder b = mService.makeSurfaceBuilder(s);
         b.setSize(mSurfaceSize, mSurfaceSize);
-
+        b.setContainerLayer(true);
         if (child == null) {
             return b;
         }
diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java
index 66c8cca8f0e09..4548cec88e7e5 100644
--- a/services/core/java/com/android/server/wm/WindowSurfaceController.java
+++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java
@@ -104,6 +104,7 @@ class WindowSurfaceController {
 
         Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "new SurfaceControl");
         final SurfaceControl.Builder b = win.makeSurface()
+                .setBufferLayer()
                 .setParent(win.getSurfaceControl())
                 .setName(name)
                 .setSize(w, h)