diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 17:48:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 17:48:48 -0700 |
| commit | ba5372f8182ba64e0a48ef89f04be74f53fc5c0e (patch) | |
| tree | 3d622eaa1c789d79587d01e9ec59000c794f361f /libs/surfaceflinger/LayerBase.h | |
| parent | b5f2ce6e2f3395fb944136d4d88aec4ac0783aca (diff) | |
| parent | 18b6b49ea5235fb6c0802db9a0cc2c6dd20646cb (diff) | |
| download | frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.zip frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.tar.gz frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.tar.bz2 | |
Merge change 22021 into eclair
* changes:
fix a bug that caused the PixelFormat viewed by Surface to be wrong.
Diffstat (limited to 'libs/surfaceflinger/LayerBase.h')
| -rw-r--r-- | libs/surfaceflinger/LayerBase.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index 65bf55b..7791941 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -321,10 +321,9 @@ public: class Surface : public BnSurface { public: + int32_t getToken() const { return mToken; } + int32_t getIdentity() const { return mIdentity; } - virtual void getSurfaceData( - ISurfaceFlingerClient::surface_data_t* params) const; - protected: Surface(const sp<SurfaceFlinger>& flinger, SurfaceID id, int identity, |