diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-31 16:59:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 16:59:11 +0000 |
| commit | 6e74e3ccd972fe90d9998f6b683e25dca38f470d (patch) | |
| tree | f7b199cf3e6a386f49029c93a972032036e64a24 | |
| parent | 04c9683aa1bb962bef3dce7f3cfd389a458133a2 (diff) | |
| parent | 9b901805ed2e918c25e13134757a967caaaeebb9 (diff) | |
| download | frameworks_native-6e74e3ccd972fe90d9998f6b683e25dca38f470d.zip frameworks_native-6e74e3ccd972fe90d9998f6b683e25dca38f470d.tar.gz frameworks_native-6e74e3ccd972fe90d9998f6b683e25dca38f470d.tar.bz2 | |
Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
| -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; |