diff options
| author | 2009-07-06 14:52:04 -0700 | |
|---|---|---|
| committer | 2009-07-06 14:52:04 -0700 | |
| commit | d8b2a6412daef032d89c23e979758f6334b62093 (patch) | |
| tree | dba55e2701d88e7bb380604520a230abb16b4b66 /include/ui/ISurfaceFlingerClient.h | |
| parent | d719890cab1eec09cbf556a3b86cc02b0f0ef8d7 (diff) | |
| parent | 03a9a3449af3e0e79e9bbcd87f8057189ab9e151 (diff) | |
Merge commit 'goog/master_gl' into merge_master_gl
Diffstat (limited to 'include/ui/ISurfaceFlingerClient.h')
| -rw-r--r-- | include/ui/ISurfaceFlingerClient.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/ui/ISurfaceFlingerClient.h b/include/ui/ISurfaceFlingerClient.h index b6cbb0b80b68..932a70a854a1 100644 --- a/include/ui/ISurfaceFlingerClient.h +++ b/include/ui/ISurfaceFlingerClient.h @@ -52,12 +52,11 @@ public: struct surface_data_t { int32_t token; int32_t identity; - sp<IMemoryHeap> heap[2]; status_t readFromParcel(const Parcel& parcel); status_t writeToParcel(Parcel* parcel) const; }; - virtual void getControlBlocks(sp<IMemory>* ctl) const = 0; + virtual sp<IMemoryHeap> getControlBlock() const = 0; virtual sp<ISurface> createSurface( surface_data_t* data, int pid, |