diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-31 22:57:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 22:57:42 +0000 |
| commit | 9fc06c5e2131cdf0d76a3838215c057f57da67e3 (patch) | |
| tree | 024748e929b1edf74f9b53c3788de220f8296f04 /services | |
| parent | 3170581704fa59a8672262c0e6c68f455d470214 (diff) | |
| parent | 6e74e3ccd972fe90d9998f6b683e25dca38f470d (diff) | |
| download | frameworks_native-9fc06c5e2131cdf0d76a3838215c057f57da67e3.zip frameworks_native-9fc06c5e2131cdf0d76a3838215c057f57da67e3.tar.gz frameworks_native-9fc06c5e2131cdf0d76a3838215c057f57da67e3.tar.bz2 | |
am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
* commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d':
surfaceflinger: fix -Woverloaded-virtual warning
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/LayerDim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/LayerDim.h b/services/surfaceflinger/LayerDim.h index 4de0ddc..a0cfca9 100644 --- a/services/surfaceflinger/LayerDim.h +++ b/services/surfaceflinger/LayerDim.h @@ -28,7 +28,7 @@ namespace android { class LayerDim : public Layer { -public: +public: LayerDim(SurfaceFlinger* flinger, const sp<Client>& client, const String8& name, uint32_t w, uint32_t h, uint32_t flags); virtual ~LayerDim(); @@ -36,7 +36,7 @@ public: virtual const char* getTypeId() const { return "LayerDim"; } virtual void onDraw(const sp<const DisplayDevice>& hw, const Region& clip, bool useIdentityTransform) const; - virtual bool isOpaque() const { return false; } + virtual bool isOpaque(const Layer::State&) const { return false; } virtual bool isSecure() const { return false; } virtual bool isFixedSize() const { return true; } virtual bool isVisible() const; |