diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-04-04 13:00:35 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-04-04 13:19:09 -0700 |
| commit | c25c54f4b19e9a8bd5e908980ab8fdb96854678b (patch) | |
| tree | c4fbded7a08ee796b01530a27c5d41333738c988 /camera/device/1.0/default/CameraDevice.cpp | |
| parent | da0bc84ec6f918b74b75fd8724137d1db4b9dd54 (diff) | |
Revert "camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages"
This reverts commit 2d80c0d66f9ca869d6102f07bd236b7c4c94c205.
Test: fix b/36876770
Bug: b/36876770
Change-Id: Ia251ec97273d71fd5bc759aa1161960f6266358a
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index 5e3fcf2b79..6eeda1caa3 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp @@ -20,8 +20,6 @@ #include <hardware/gralloc1.h> #include <utils/Trace.h> -#include <grallocusage/GrallocUsageConversion.h> - #include "CameraDevice_1_0.h" namespace android { @@ -31,6 +29,7 @@ namespace device { namespace V1_0 { namespace implementation { +using ::android::hardware::graphics::allocator::V2_0::ProducerUsage; using ::android::hardware::graphics::common::V1_0::PixelFormat; HandleImporter& CameraDevice::sHandleImporter = HandleImporter::getInstance(); @@ -253,10 +252,7 @@ int CameraDevice::sSetUsage(struct preview_stream_ops* w, int usage) { } object->cleanUpCirculatingBuffers(); - ProducerUsageFlags producerUsage; - uint64_t consumerUsage; - ::android_convertGralloc0To1Usage(usage, &producerUsage, &consumerUsage); - return getStatusT(object->mPreviewCallback->setUsage(producerUsage)); + return getStatusT(object->mPreviewCallback->setUsage((ProducerUsage) usage)); } int CameraDevice::sSetSwapInterval(struct preview_stream_ops *w, int interval) { |