From 5fea55b2d2d27c5ff714897632735efb65a52d4c Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Mon, 10 Dec 2018 13:05:52 -0800
Subject: Remove usage of scoped connections.

Tracking SurfaceFlinger changes. Now to construct a child surface
we need the SurfaceControl as opposed to just the surface, and so
we parcel the SurfaceControl across relayout.

Test: Manual
Bug: 62536731
Bug: 111373437
Bug: 111297488
Change-Id: I0a034767e92becec63071d7b1e3e71b95d505b77
---
 core/java/android/app/ActivityView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/java/android/app/ActivityView.java')

diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 0b5776e89524..f64e0671f459 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -320,7 +320,7 @@ public class ActivityView extends ViewGroup {
         public void surfaceCreated(SurfaceHolder surfaceHolder) {
             mTmpSurface = new Surface();
             if (mVirtualDisplay == null) {
-                initVirtualDisplay(new SurfaceSession(surfaceHolder.getSurface()));
+                initVirtualDisplay(new SurfaceSession());
                 if (mVirtualDisplay != null && mActivityViewCallback != null) {
                     mActivityViewCallback.onActivityViewReady(ActivityView.this);
                 }
@@ -382,6 +382,7 @@ public class ActivityView extends ViewGroup {
 
         mRootSurfaceControl = new SurfaceControl.Builder(surfaceSession)
                 .setContainerLayer(true)
+                .setParent(mSurfaceView.getSurfaceControl())
                 .setName(DISPLAY_NAME)
                 .build();
 
-- 
cgit v1.2.3