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/RefreshRateOverlay.cpp

diff --git a/services/surfaceflinger/RefreshRateOverlay.cpp b/services/surfaceflinger/RefreshRateOverlay.cpp
index 240c84e..e70bfe4 100644
--- a/services/surfaceflinger/RefreshRateOverlay.cpp
+++ b/services/surfaceflinger/RefreshRateOverlay.cpp
@@ -31,9 +31,9 @@
     const status_t ret =
             mFlinger.createLayer(String8("RefreshRateOverlay"), mClient, 0, 0,
                                  PIXEL_FORMAT_RGBA_8888, ISurfaceComposerClient::eFXSurfaceColor,
-                                 LayerMetadata(), &mIBinder, &mGbp, nullptr);
+                                 LayerMetadata(), &mIBinder, &mGbp, &mLayer);
     if (ret) {
-        ALOGE("failed to create color layer");
+        ALOGE("failed to color layer");
         return false;
     }