summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2017-05-04 16:40:43 -0700
committer Colin Cross <ccross@android.com> 2017-05-05 00:19:41 +0000
commit64865fddc2cfaa8ba3d81ef582369435328cb6d7 (patch)
treec189b450e3dde60a59339a3d95f2b4ccdd826847
parent8879d78fee9576700240c2ea99ae68a9fc5f97ef (diff)
Fix typo introduced by manual merge
Manual merge from previous commit contains an incorrect copy-paste error. Test: Build Change-Id: Icde12b12d06c12e9d89adec231ceee1d2bb01995 (cherry picked from commit c50f4206bdbd70506be8efc2b155ec7da4bab8c6)
-rw-r--r--include/gui/BufferQueue.h2
-rw-r--r--include/gui/BufferQueueProducer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h
index d9292b7fec..ba5cbf7eb4 100644
--- a/include/gui/BufferQueue.h
+++ b/include/gui/BufferQueue.h
@@ -57,7 +57,7 @@ public:
class ProxyConsumerListener : public BnConsumerListener {
public:
explicit ProxyConsumerListener(const wp<ConsumerListener>& consumerListener);
- ~ProxyConsumerListener() const;
+ ~ProxyConsumerListener() override;
void onDisconnect() override;
void onFrameAvailable(const BufferItem& item) override;
void onFrameReplaced(const BufferItem& item) override;
diff --git a/include/gui/BufferQueueProducer.h b/include/gui/BufferQueueProducer.h
index 460993cf0d..87bc8008e1 100644
--- a/include/gui/BufferQueueProducer.h
+++ b/include/gui/BufferQueueProducer.h
@@ -30,7 +30,7 @@ public:
friend class BufferQueue; // Needed to access binderDied
BufferQueueProducer(const sp<BufferQueueCore>& core, bool consumerIsSurfaceFlinger = false);
- ~BufferQueueProducer() const;
+ ~BufferQueueProducer() override;
// requestBuffer returns the GraphicBuffer for slot N.
//