From a5408be10625e2dab485f2cd8d85a30c33f096d8 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 9 Dec 2019 01:00:57 +0100 Subject: [PATCH] Test --- .github/workflows/emulator_script.sh | 2 +- .../com/otaliastudios/cameraview/engine/Camera1Engine.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/emulator_script.sh b/.github/workflows/emulator_script.sh index 4cb2522e..6e114b63 100755 --- a/.github/workflows/emulator_script.sh +++ b/.github/workflows/emulator_script.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash adb logcat -c -adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I *:E & +adb logcat CameraOrchestrator:I CameraEngine:I CameraView:I *:E -v color & ./gradlew cameraview:connectedCheck \ No newline at end of file diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java index e4791ae4..99f9d1ee 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera1Engine.java @@ -734,9 +734,8 @@ public class Camera1Engine extends CameraEngine implements @Override public void onPreviewFrame(byte[] data, Camera camera) { if (data == null) { - // Let's test this with an exception. - throw new RuntimeException("Camera1 returns null data from onPreviewFrame! " + - "This would make the frame processors crash later."); + // Seen this happen in logs. + return; } Frame frame = getFrameManager().getFrame(data, System.currentTimeMillis(),