commit 36b55bc2acc8a7aa9a8ba41a9c7a21aa0626b0f7
author Huihong Luo <huisinro@google.com> Tue Mar 08 14:50:45 2022 -0800
committer Huihong Luo <huisinro@google.com> Thu Apr 07 20:53:48 2022 +0000
tree 13028589e08988734aacfd604afd8183e23201b6
parent 4fed9b4544a6f8e1819dfde45bc6d8eeeb89aa2e

Sync with ISurfaceComposerClient changes

ISurfaceComposerClient in libgui is migrated to AIDL interface.

Bug: 172002646
Test: atest libgui_test
Change-Id: I5301a710a84bcf90ca4a789e184748e889115045

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 98edcc3..c2afc60 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -80,7 +80,7 @@
     Surface* surface = static_cast<Surface*>(window);
     sp<IBinder> parentHandle = surface->getSurfaceControlHandle();
 
-    uint32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;
+    int32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;
     sp<SurfaceControl> surfaceControl;
     if (parentHandle) {
         surfaceControl =
@@ -88,11 +88,8 @@
                                       // Format is only relevant for buffer queue layers.
                                       PIXEL_FORMAT_UNKNOWN /* format */, flags, parentHandle);
     } else {
-        surfaceControl =
-                client->createWithSurfaceParent(String8(debug_name), 0 /* width */, 0 /* height */,
-                                                // Format is only relevant for buffer queue layers.
-                                                PIXEL_FORMAT_UNKNOWN /* format */, flags,
-                                                static_cast<Surface*>(window));
+        // deprecated, this should no longer be used
+        surfaceControl = nullptr;
     }
 
     if (!surfaceControl) {