commit 35187b32107eff2ded94adf29c19192524537ee1
author Marissa Wall <marissaw@google.com> Tue Jan 08 10:08:52 2019 -0800
committer Marissa Wall <marissaw@google.com> Thu Jan 10 09:29:39 2019 -0800
tree b5e7d6dcfd95e6087ffa3644f982e434fe0cf467
parent 6e1ceefbba451a2778c192044ead4bd8add9f394

blast: [FIXED] create SurfaceControl from Surface parent

Create a child SurfaceControl from a parent Surface. This is done
by sending the parent IGBP to SurfaceFlinger who gets the parent
Layer information.

This is change is necessary for public SurfaceControl because
createScopedConnection is deprecated.

[Previous version used Layer::mStateMutex which was removed hours
 before this patch went in. Presubmit did not catch the conflict
 so the patch was immediately reverted. This version does not have
 that conflict.]

Test: atest CtsViewTestCases:android.view.cts.ASurfaceControlTest
Bug: 80477568
Change-Id: Ibbfb2851ff71c21cce1761cab434b85735e35515

services/surfaceflinger/Client.h

diff --git a/services/surfaceflinger/Client.h b/services/surfaceflinger/Client.h
index d0051de..0f5ee4c 100644
--- a/services/surfaceflinger/Client.h
+++ b/services/surfaceflinger/Client.h
@@ -58,6 +58,12 @@
             sp<IBinder>* handle,
             sp<IGraphicBufferProducer>* gbp);
 
+    virtual status_t createWithSurfaceParent(const String8& name, uint32_t w, uint32_t h,
+                                             PixelFormat format, uint32_t flags,
+                                             const sp<IGraphicBufferProducer>& parent,
+                                             int32_t windowType, int32_t ownerUid,
+                                             sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp);
+
     virtual status_t clearLayerFrameStats(const sp<IBinder>& handle) const;
 
     virtual status_t getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outStats) const;