diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:29:07 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:22:06 +0000 |
| commit | 4cd7227b78773fbd201bee4627b55f4008e961e7 (patch) | |
| tree | 4a79f588318cff97038aa91eaa46469989518867 /services/surfaceflinger/Layer.h | |
| parent | be1b7537097779385da94ae98e0cca76732d74ba (diff) | |
| parent | 529cb9ed9c5d62d5b270cdd650380ae116382143 (diff) | |
| download | frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.zip frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.gz frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1
Android 4.2.2 release 1
Conflicts:
libs/ui/GraphicBufferAllocator.cpp
Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166
Diffstat (limited to 'services/surfaceflinger/Layer.h')
| -rw-r--r-- | services/surfaceflinger/Layer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 6f75d8c..c5eb26b 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -91,8 +91,8 @@ public: inline const sp<GraphicBuffer>& getActiveBuffer() const { return mActiveBuffer; } // Updates the transform hint in our SurfaceTexture to match - // the current orientation of the default display device. - virtual void updateTransformHint() const; + // the current orientation of the display device. + virtual void updateTransformHint(const sp<const DisplayDevice>& hw) const; protected: virtual void onFirstRef(); |