diff options
| author | Marissa Wall <marissaw@google.com> | 2019-04-09 18:52:57 +0000 |
|---|---|---|
| committer | Marissa Wall <marissaw@google.com> | 2019-04-10 17:38:03 +0000 |
| commit | 2d814fb67aaea328cebcbdbb766ade5daf1e2442 (patch) | |
| tree | 42ebce28d4caf7803a9562742bd9013d5828880e /libs/gui/include | |
| parent | 4293e9d75d5b0d033126f529ab61dd1f4a8d8420 (diff) | |
| download | android_frameworks_native-2d814fb67aaea328cebcbdbb766ade5daf1e2442.tar.gz android_frameworks_native-2d814fb67aaea328cebcbdbb766ade5daf1e2442.tar.bz2 android_frameworks_native-2d814fb67aaea328cebcbdbb766ade5daf1e2442.zip | |
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
Diffstat (limited to 'libs/gui/include')
| -rw-r--r-- | libs/gui/include/gui/SurfaceControl.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/gui/include/gui/SurfaceControl.h b/libs/gui/include/gui/SurfaceControl.h index 23bfc0256..55efcbfb3 100644 --- a/libs/gui/include/gui/SurfaceControl.h +++ b/libs/gui/include/gui/SurfaceControl.h @@ -84,9 +84,6 @@ public: explicit SurfaceControl(const sp<SurfaceControl>& other); - SurfaceControl(const sp<SurfaceComposerClient>& client, const sp<IBinder>& handle, - const sp<IGraphicBufferProducer>& gbp, bool owned); - private: // can't be copied SurfaceControl& operator = (SurfaceControl& rhs); @@ -95,6 +92,12 @@ private: friend class SurfaceComposerClient; friend class Surface; + SurfaceControl( + const sp<SurfaceComposerClient>& client, + const sp<IBinder>& handle, + const sp<IGraphicBufferProducer>& gbp, + bool owned); + ~SurfaceControl(); sp<Surface> generateSurfaceLocked() const; |