diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-08-22 22:57:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-22 22:57:24 +0000 |
| commit | f293627fc2858d8a569b28e8da80047848c961dc (patch) | |
| tree | d55bbf66b208f55fb07c47d0409be91130b5fa6c /core/java/android/hardware | |
| parent | 8f91c33d8d5cd393107d5fb38e4682a5486e4b50 (diff) | |
| parent | fc19e2cfe5bd0bc5f5be8a216ef5ee398a86b048 (diff) | |
| download | frameworks_base-f293627fc2858d8a569b28e8da80047848c961dc.zip frameworks_base-f293627fc2858d8a569b28e8da80047848c961dc.tar.gz frameworks_base-f293627fc2858d8a569b28e8da80047848c961dc.tar.bz2 | |
Merge "Camera2: Send warning when burst request list is empty" into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDevice.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java index 1fb690e..e7495d3 100644 --- a/core/java/android/hardware/camera2/impl/CameraDevice.java +++ b/core/java/android/hardware/camera2/impl/CameraDevice.java @@ -143,6 +143,10 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { @Override public void captureBurst(List<CaptureRequest> requests, CaptureListener listener) throws CameraAccessException { + if (requests.isEmpty()) { + Log.w(TAG, "Capture burst request list is empty, do nothing!"); + return; + } // TODO throw new UnsupportedOperationException("Burst capture implemented yet"); @@ -183,6 +187,10 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { @Override public void setRepeatingBurst(List<CaptureRequest> requests, CaptureListener listener) throws CameraAccessException { + if (requests.isEmpty()) { + Log.w(TAG, "Set Repeating burst request list is empty, do nothing!"); + return; + } // TODO throw new UnsupportedOperationException("Burst capture implemented yet"); } |