diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java
index 1fb690e3c59d1..e7495d3aa53c9 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");
     }