diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-13 14:59:49 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-13 15:16:53 -0800 |
| commit | 4037c458a7594cb3cd81a14e7e974abc28180187 (patch) | |
| tree | 0c67eda2af312b22742cf984258095cfbac5b211 /services/surfaceflinger/DisplayHardware | |
| parent | c5657b0c344b39d794c4c8241004d4e19341c096 (diff) | |
| parent | 07dffa184fc308bdeff90ab047810405c6bf4684 (diff) | |
| download | frameworks_native-4037c458a7594cb3cd81a14e7e974abc28180187.zip frameworks_native-4037c458a7594cb3cd81a14e7e974abc28180187.tar.gz frameworks_native-4037c458a7594cb3cd81a14e7e974abc28180187.tar.bz2 | |
resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
Diffstat (limited to 'services/surfaceflinger/DisplayHardware')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h index 363dce2..0fab7e2 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h @@ -86,6 +86,7 @@ public: virtual status_t compositionComplete(); virtual status_t advanceFrame(); virtual void onFrameCommitted(); + using BBinder::dump; virtual void dump(String8& result) const; virtual void resizeBuffers(const uint32_t w, const uint32_t h); |