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
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp
index 5e3fcf2..6eeda1c 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 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 @@
}
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) {