summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/device3/Camera3InputStream.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-04-15 17:56:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-15 17:56:26 +0000
commitc44111b22c26236cb0b32d3fbd1cc9fad3fb28ff (patch)
tree3eae04149058cd321b732fb201efb1c2d3e465b4 /services/camera/libcameraservice/device3/Camera3InputStream.cpp
parenta5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8 (diff)
parent4d44cad22ea925a651463f2d51d6586c14d4b787 (diff)
downloadframeworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.zip
frameworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.tar.gz
frameworks_av-c44111b22c26236cb0b32d3fbd1cc9fad3fb28ff.tar.bz2
Merge "Camera2: Add prepare for output streams"
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3InputStream.cpp')
-rw-r--r--services/camera/libcameraservice/device3/Camera3InputStream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3InputStream.cpp b/services/camera/libcameraservice/device3/Camera3InputStream.cpp
index fa97e57..84c5754 100644
--- a/services/camera/libcameraservice/device3/Camera3InputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3InputStream.cpp
@@ -275,7 +275,7 @@ status_t Camera3InputStream::configureQueueLocked() {
return OK;
}
-status_t Camera3InputStream::getEndpointUsage(uint32_t *usage) {
+status_t Camera3InputStream::getEndpointUsage(uint32_t *usage) const {
// Per HAL3 spec, input streams have 0 for their initial usage field.
*usage = 0;
return OK;