diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 22:16:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 22:16:16 +0000 |
| commit | 8d3c76bf857e06f52bfc9613c9dc4b85aa6fff70 (patch) | |
| tree | b9097b81d11c0c2a899e75b68c70efccf90dfeeb | |
| parent | 5348840b941745f0f87949670a9e7a706c91cb6b (diff) | |
| parent | 3de961d7bf349f4b3fd6f1a2a1f2ef61aad2b483 (diff) | |
| download | platform_hardware_interfaces-8d3c76bf857e06f52bfc9613c9dc4b85aa6fff70.tar.gz platform_hardware_interfaces-8d3c76bf857e06f52bfc9613c9dc4b85aa6fff70.tar.bz2 platform_hardware_interfaces-8d3c76bf857e06f52bfc9613c9dc4b85aa6fff70.zip | |
Merge "Camera: Allow HAL not call notify() with ERROR_BUFFER" into rvc-dev am: 3de961d7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11906338
Change-Id: I73b11cbf5e3a71d7c6ef699233a15444573ed0e3
| -rw-r--r-- | camera/device/3.2/ICameraDeviceCallback.hal | 7 | ||||
| -rw-r--r-- | current.txt | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/camera/device/3.2/ICameraDeviceCallback.hal b/camera/device/3.2/ICameraDeviceCallback.hal index 607502e5bf..206a649da3 100644 --- a/camera/device/3.2/ICameraDeviceCallback.hal +++ b/camera/device/3.2/ICameraDeviceCallback.hal @@ -87,8 +87,11 @@ interface ICameraDeviceCallback { * ERROR_RESULT message. * * If an output buffer cannot be filled, its status field must be set to - * STATUS_ERROR. In addition, notify() must be called with a ERROR_BUFFER - * message. + * STATUS_ERROR. In this case, notify() isn't required to be called with + * an ERROR_BUFFER message. The framework will simply treat the notify() + * call with ERROR_BUFFER as a no-op, and derive whether and when to notify + * the application of buffer loss based on the buffer status and whether or not + * the entire capture has failed. * * If the entire capture has failed, then this method still needs to be * called to return the output buffers to the framework. All the buffer diff --git a/current.txt b/current.txt index ad7879e484..72646efc99 100644 --- a/current.txt +++ b/current.txt @@ -588,7 +588,7 @@ c3ec182ce325862b7d79e526f3e170c02cfee1497ed309d7c60d0de4ca636b0b android.hardwar 578f640c653726d58f99c84a7e1bb63862e21ef7cbb4f7d95c3cc62de00dca35 android.hardware.automotive.evs@1.0::IEvsDisplay f5bc6aa840db933cb9fd36668b06d3e2021cf5384bb70e459f22e2f2f921fba5 android.hardware.automotive.evs@1.0::IEvsEnumerator d3a344b7bd4c0d2658ae7209f55a979b8f53f361fd00f4fca29d5baa56d11fd2 android.hardware.automotive.evs@1.0::types -d123013165a19b6353cdc46a57b2ff4a17179619d36dbd595dfcf15dcd099af6 android.hardware.camera.device@3.2::ICameraDeviceCallback # b/155353799 +2924c3e43858190ee3e2da4c2fb93bba8ae065fe314451f035a7ec52cb80c94a android.hardware.camera.device@3.2::ICameraDeviceCallback # b/155353799 2410dd02d67786a732d36e80b0f8ccf55086604ef37f9838e2013ff2c571e404 android.hardware.camera.device@3.5::types cd06a7911b9acd4a653bbf7133888878fbcb3f84be177c7a3f1becaae3d8618f android.hardware.camera.metadata@3.2::types 5cf81b1001296fbb3c5b3d275a859244f61cec5fa858d7be9cca46c5b7dfa733 android.hardware.camera.metadata@3.2::types # b/150331548 |