diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-09-27 14:24:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-27 14:24:09 -0700 |
| commit | feb158b3cbd0dada89b0437c3e09699ba3f982de (patch) | |
| tree | a610312c9d024fe83a910ea4d7964e5af74812c5 /services/surfaceflinger | |
| parent | ab7ed38d5fea82db64eb90bad9d4c646d61d15df (diff) | |
| parent | 5b315da4e8a3746376af480c8fe01f98cbc34b33 (diff) | |
| download | frameworks_base-feb158b3cbd0dada89b0437c3e09699ba3f982de.zip frameworks_base-feb158b3cbd0dada89b0437c3e09699ba3f982de.tar.gz frameworks_base-feb158b3cbd0dada89b0437c3e09699ba3f982de.tar.bz2 | |
Merge changes Ib302d79e,Ib4ee085f
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
Diffstat (limited to 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/Layer.h | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/LayerBase.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 1361fd6..41d7a90 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -112,6 +112,11 @@ void Layer::onRemoved() mSurfaceTexture->abandon(); } +void Layer::setName(const String8& name) { + LayerBase::setName(name); + mSurfaceTexture->setName(name); +} + sp<ISurface> Layer::createSurface() { class BSurface : public BnSurface, public LayerCleaner { diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index ff389ae..82e3521 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -74,6 +74,7 @@ public: virtual bool isProtected() const; virtual void onRemoved(); virtual sp<Layer> getLayer() const { return const_cast<Layer*>(this); } + virtual void setName(const String8& name); // LayerBaseClient interface virtual wp<IBinder> getSurfaceTextureBinder() const; diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h index 268ba2d..7f62145 100644 --- a/services/surfaceflinger/LayerBase.h +++ b/services/surfaceflinger/LayerBase.h @@ -81,7 +81,7 @@ public: Region transparentRegion; }; - void setName(const String8& name); + virtual void setName(const String8& name); String8 getName() const; // modify current state |