| commit | 0471bdec9bdc2d455ef5b821935f46c3565c7421 | [log] [tgz] |
|---|---|---|
| author | Chia-I Wu <olv@google.com> | Wed Jul 19 21:34:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 21:34:56 2017 +0000 |
| tree | bd6ade3654bf0966c5453abc28ea48d5bcbbd786 | |
| parent | 42e8b6e078de6b16b5fbf4a68a581ded085159f5 [diff] | |
| parent | 9071cc5bbce92303ae0fde4803b6f2c571342583 [diff] |
Merge "graphics: sideband streams are not buffers" into oc-dr1-dev am: 9071cc5bbc Change-Id: Ide31e01a39a4fef9bad680ff070fbf894ac7abc2
diff --git a/graphics/composer/2.1/default/ComposerClient.cpp b/graphics/composer/2.1/default/ComposerClient.cpp index 5a96e29..e792034 100644 --- a/graphics/composer/2.1/default/ComposerClient.cpp +++ b/graphics/composer/2.1/default/ComposerClient.cpp
@@ -1149,6 +1149,13 @@ // input handle is ignored *outHandle = entry->getHandle(); + } else if (cache == BufferCache::LAYER_SIDEBAND_STREAMS) { + if (handle) { + *outHandle = native_handle_clone(handle); + if (*outHandle == nullptr) { + return Error::NO_RESOURCES; + } + } } else { if (!sHandleImporter.importBuffer(handle)) { return Error::NO_RESOURCES;
diff --git a/graphics/composer/2.1/default/ComposerClient.h b/graphics/composer/2.1/default/ComposerClient.h index ee825fe..fc5c223 100644 --- a/graphics/composer/2.1/default/ComposerClient.h +++ b/graphics/composer/2.1/default/ComposerClient.h
@@ -110,6 +110,7 @@ protected: struct LayerBuffers { std::vector<BufferCacheEntry> Buffers; + // the handle is a sideband stream handle, not a buffer handle BufferCacheEntry SidebandStream; };