diff options
| author | Dan Stoza <stoza@google.com> | 2015-06-08 16:30:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 16:30:15 +0000 |
| commit | 5b36ea44c58f8def561bf37c79d3452b21e2deab (patch) | |
| tree | 3ea640f1e7daaaa63a71fbe133729fba26bd95bd /include | |
| parent | 5b23b5bf45b115d2c91448747ea40b63377d4abd (diff) | |
| parent | a2ca9bf0a9789e9e5e37961ebfb356347f59309e (diff) | |
| download | frameworks_native-5b36ea44c58f8def561bf37c79d3452b21e2deab.zip frameworks_native-5b36ea44c58f8def561bf37c79d3452b21e2deab.tar.gz frameworks_native-5b36ea44c58f8def561bf37c79d3452b21e2deab.tar.bz2 | |
Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/BufferQueueProducer.h | 3 | ||||
| -rw-r--r-- | include/gui/IGraphicBufferProducer.h | 3 | ||||
| -rw-r--r-- | include/gui/Surface.h | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/include/gui/BufferQueueProducer.h b/include/gui/BufferQueueProducer.h index 9754a89..afa7eb1 100644 --- a/include/gui/BufferQueueProducer.h +++ b/include/gui/BufferQueueProducer.h @@ -178,9 +178,6 @@ public: // See IGraphicBufferProducer::setGenerationNumber virtual status_t setGenerationNumber(uint32_t generationNumber); - // See IGraphicBufferProducer::getConsumerName - virtual String8 getConsumerName() const override; - private: // This is required by the IBinder::DeathRecipient interface virtual void binderDied(const wp<IBinder>& who); diff --git a/include/gui/IGraphicBufferProducer.h b/include/gui/IGraphicBufferProducer.h index 9530de1..4ca4cd5 100644 --- a/include/gui/IGraphicBufferProducer.h +++ b/include/gui/IGraphicBufferProducer.h @@ -480,9 +480,6 @@ public: // affected and will retain their current generation number. The generation // number defaults to 0. virtual status_t setGenerationNumber(uint32_t generationNumber) = 0; - - // Returns the name of the connected consumer. - virtual String8 getConsumerName() const = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/gui/Surface.h b/include/gui/Surface.h index 72f1067..261b07c 100644 --- a/include/gui/Surface.h +++ b/include/gui/Surface.h @@ -106,9 +106,6 @@ public: * See IGBP::setGenerationNumber for more information. */ status_t setGenerationNumber(uint32_t generationNumber); - // See IGraphicBufferProducer::getConsumerName - String8 getConsumerName() const; - protected: virtual ~Surface(); |