commit 47cf8e62b81770c0896aac444ef22a840b3a2c5e
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:00:03 2017 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 13:18:41 2017 -0700
tree 9744b05c0c22855b54fd7a1eafdc2b0a837b3de3
parent 80158939f9ce31676d6520ff97dc3af4a9760a7f

Revert "Camera: Map between bufferqueue gralloc0 usage, and HIDL gralloc1 usages"

This reverts commit 1a2f15daf13552e86324025cf6d31d887cd8fa02.

Test: fix b/36876770
Bug: b/36876770
Change-Id: Ie7b8c9ee444e3e8667154b396e3e6a556b54739a

services/camera/libcameraservice/device1/CameraHardwareInterface.h

diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
index caeacef..c2b0e9c 100644
--- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h
+++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
@@ -461,7 +461,7 @@
     hardware::Return<hardware::camera::common::V1_0::Status>
             setCrop(int32_t left, int32_t top, int32_t right, int32_t bottom) override;
     hardware::Return<hardware::camera::common::V1_0::Status>
-            setUsage(hardware::camera::device::V1_0::ProducerUsageFlags usage) override;
+            setUsage(hardware::graphics::allocator::V2_0::ProducerUsage usage) override;
     hardware::Return<hardware::camera::common::V1_0::Status>
             setSwapInterval(int32_t interval) override;
     hardware::Return<void> getMinUndequeuedBufferCount(