commit 2d814fb67aaea328cebcbdbb766ade5daf1e2442
author Marissa Wall <marissaw@google.com> Tue Apr 09 18:52:57 2019 +0000
committer Marissa Wall <marissaw@google.com> Wed Apr 10 17:38:03 2019 +0000
tree 42ebce28d4caf7803a9562742bd9013d5828880e
parent 4293e9d75d5b0d033126f529ab61dd1f4a8d8420

Revert "SurfaceFlinger: Validate layers before casting."

This reverts commit 4293e9d75d5b0d033126f529ab61dd1f4a8d8420.

Reason for revert: it broke CtsViewTestCases:android.view.cts.ASurfaceControlTest

Bug: 129768960

Change-Id: I4b97869eefdf9108cf2e0e33656037780e5376f7

services/surfaceflinger/Client.cpp

diff --git a/services/surfaceflinger/Client.cpp b/services/surfaceflinger/Client.cpp
index 508be13..e54b460 100644
--- a/services/surfaceflinger/Client.cpp
+++ b/services/surfaceflinger/Client.cpp
@@ -76,9 +76,18 @@
                                uint32_t flags, const sp<IBinder>& parentHandle,
                                LayerMetadata metadata, sp<IBinder>* handle,
                                sp<IGraphicBufferProducer>* gbp) {
+    sp<Layer> parent = nullptr;
+    if (parentHandle != nullptr) {
+        auto layerHandle = reinterpret_cast<Layer::Handle*>(parentHandle.get());
+        parent = layerHandle->owner.promote();
+        if (parent == nullptr) {
+            return NAME_NOT_FOUND;
+        }
+    }
+
     // We rely on createLayer to check permissions.
     return mFlinger->createLayer(name, this, w, h, format, flags, std::move(metadata), handle, gbp,
-                                 parentHandle);
+                                 &parent);
 }
 
 status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32_t h,