summaryrefslogtreecommitdiff
path: root/camera/common/1.0/default/include/CameraModule.h
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2019-02-11 01:22:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-11 01:22:52 +0000
commitfbb176e069a0f188131587a0a2d1396d8dc6fd57 (patch)
tree3542508a8ab85b401cfe5bb117f8559a03148747 /camera/common/1.0/default/include/CameraModule.h
parent3e9aeb2ed3ad727216395967009ea1a0c3b438b6 (diff)
parentaa04b3ba106392e4c5dfb33d4f3c6c26f48a7d6d (diff)
Merge changes from topic "camera-provider-2.5"
* changes: Camera: Add default 2.5 provider for legacy and external webcam HALs Camera: Restructure default camera.provider 2.4 camera.provider: Add @2.5 to support notifyDeviceStatusChange
Diffstat (limited to 'camera/common/1.0/default/include/CameraModule.h')
-rw-r--r--camera/common/1.0/default/include/CameraModule.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/common/1.0/default/include/CameraModule.h b/camera/common/1.0/default/include/CameraModule.h
index ee75e722d1..32c387f107 100644
--- a/camera/common/1.0/default/include/CameraModule.h
+++ b/camera/common/1.0/default/include/CameraModule.h
@@ -67,6 +67,7 @@ public:
void removeCamera(int cameraId);
int getPhysicalCameraInfo(int physicalCameraId, camera_metadata_t **physicalInfo);
int isStreamCombinationSupported(int cameraId, camera_stream_combination_t *streams);
+ void notifyDeviceStateChange(uint64_t deviceState);
private:
// Derive camera characteristics keys defined after HAL device version