summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-06-08 16:21:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 16:21:03 +0000
commit5b23b5bf45b115d2c91448747ea40b63377d4abd (patch)
tree45cb4cf71da812c9b0a66b0489698ea377ba276a /include
parent13b1604018968408bcc5553e1fa5ea9df3e4e009 (diff)
parent107fbe5599016b0e35145a1a00c4f238b63d61e4 (diff)
downloadframeworks_native-5b23b5bf45b115d2c91448747ea40b63377d4abd.zip
frameworks_native-5b23b5bf45b115d2c91448747ea40b63377d4abd.tar.gz
frameworks_native-5b23b5bf45b115d2c91448747ea40b63377d4abd.tar.bz2
Merge "libgui: Add getConsumerName" into mnc-dev
Diffstat (limited to 'include')
-rw-r--r--include/gui/BufferQueueProducer.h3
-rw-r--r--include/gui/IGraphicBufferProducer.h3
-rw-r--r--include/gui/Surface.h3
3 files changed, 9 insertions, 0 deletions
diff --git a/include/gui/BufferQueueProducer.h b/include/gui/BufferQueueProducer.h
index afa7eb1..9754a89 100644
--- a/include/gui/BufferQueueProducer.h
+++ b/include/gui/BufferQueueProducer.h
@@ -178,6 +178,9 @@ 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 4ca4cd5..9530de1 100644
--- a/include/gui/IGraphicBufferProducer.h
+++ b/include/gui/IGraphicBufferProducer.h
@@ -480,6 +480,9 @@ 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 261b07c..72f1067 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -106,6 +106,9 @@ public:
* See IGBP::setGenerationNumber for more information. */
status_t setGenerationNumber(uint32_t generationNumber);
+ // See IGraphicBufferProducer::getConsumerName
+ String8 getConsumerName() const;
+
protected:
virtual ~Surface();