diff options
| author | Rob Carr <racarr@google.com> | 2019-04-22 19:59:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-22 19:59:37 +0000 |
| commit | b432879e4156ada05d627fa4e6c2bdf672fe2083 (patch) | |
| tree | 771e25a5ba2e6171fe48564517584d18550f7608 /libs/gui/include | |
| parent | 7536d41ce13710ae221cb35980eef4069de4bb22 (diff) | |
| parent | c0df312c34d92161e955fd1057afaa1337b7a56d (diff) | |
| download | android_frameworks_native-b432879e4156ada05d627fa4e6c2bdf672fe2083.tar.gz android_frameworks_native-b432879e4156ada05d627fa4e6c2bdf672fe2083.tar.bz2 android_frameworks_native-b432879e4156ada05d627fa4e6c2bdf672fe2083.zip | |
Merge "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, 3 insertions, 6 deletions
diff --git a/libs/gui/include/gui/SurfaceControl.h b/libs/gui/include/gui/SurfaceControl.h index 55efcbfb3..23bfc0256 100644 --- a/libs/gui/include/gui/SurfaceControl.h +++ b/libs/gui/include/gui/SurfaceControl.h @@ -84,6 +84,9 @@ 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); @@ -92,12 +95,6 @@ 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; |