diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-10 17:38:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-10 17:38:28 +0000 |
| commit | eaecf54a1b516989b2c716b36f059fa2b3af0fda (patch) | |
| tree | 62521059a4dd15c71f19b19d3bff65975e2d4987 /libs/gui/include | |
| parent | 6b6cee2c3ec409fdaa93a023d13341e793a0d5a8 (diff) | |
| parent | 2d814fb67aaea328cebcbdbb766ade5daf1e2442 (diff) | |
| download | android_frameworks_native-eaecf54a1b516989b2c716b36f059fa2b3af0fda.tar.gz android_frameworks_native-eaecf54a1b516989b2c716b36f059fa2b3af0fda.tar.bz2 android_frameworks_native-eaecf54a1b516989b2c716b36f059fa2b3af0fda.zip | |
Merge "Revert "SurfaceFlinger: Validate layers before casting."" into qt-dev
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; |