From 20c62d2dbadac5b9850c659739492c8768b136b2 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Wed, 5 Feb 2020 15:25:58 -0800
Subject: [PATCH] SurfaceView: Show SurfacePackage child when reparenting

Since we aren't exposing the SurfaceControl in the public API
we need to show it for the user.

Bug: 134365580
Bug: 147303389
Test: SurfaceControlViewHostTests
Change-Id: Icec1384aeb50eef0261f3591a250f02f47737f66
---
 core/java/android/view/SurfaceView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 75d5538faedd2..b1c354f6f7173 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -1570,7 +1570,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
     private void reparentSurfacePackage(SurfaceControl.Transaction t,
             SurfaceControlViewHost.SurfacePackage p) {
         // TODO: Link accessibility IDs here.
-        t.reparent(p.getSurfaceControl(), mSurfaceControl);
+        final SurfaceControl sc = p.getSurfaceControl();
+        t.reparent(sc, mSurfaceControl).show(sc);
     }
 
     /**