diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2019-02-11 01:22:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-11 01:22:52 +0000 |
| commit | fbb176e069a0f188131587a0a2d1396d8dc6fd57 (patch) | |
| tree | 3542508a8ab85b401cfe5bb117f8559a03148747 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 3e9aeb2ed3ad727216395967009ea1a0c3b438b6 (diff) | |
| parent | aa04b3ba106392e4c5dfb33d4f3c6c26f48a7d6d (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/CameraModule.cpp')
| -rw-r--r-- | camera/common/1.0/default/CameraModule.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 08354b312d..3e3ef433a5 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -462,6 +462,17 @@ int CameraModule::isStreamCombinationSupported(int cameraId, camera_stream_combi return res; } +void CameraModule::notifyDeviceStateChange(uint64_t deviceState) { + if (getModuleApiVersion() >= CAMERA_MODULE_API_VERSION_2_5 && + mModule->notify_device_state_change != NULL) { + ATRACE_BEGIN("camera_module->notify_device_state_change"); + ALOGI("%s: calling notify_device_state_change with state %" PRId64, __FUNCTION__, + deviceState); + mModule->notify_device_state_change(deviceState); + ATRACE_END(); + } +} + status_t CameraModule::filterOpenErrorCode(status_t err) { switch(err) { case NO_ERROR: |