From 48006b69b6030f84204cb72848402f31428f9966 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 30 Oct 2020 15:49:35 -0400 Subject: [PATCH] fix(android): return empty array rather than null for Ti.Media.availableCameras if no cameras --- .../src/java/ti/modules/titanium/media/MediaModule.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java b/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java index e2d516724fe..7ab67061c67 100644 --- a/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java +++ b/android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java @@ -1403,14 +1403,13 @@ public boolean getIsCameraSupported() public int[] getAvailableCameras() { int cameraCount = Camera.getNumberOfCameras(); + int[] result = new int[cameraCount]; + if (cameraCount == 0) { - return null; + return result; } - int[] result = new int[cameraCount]; - CameraInfo cameraInfo = new CameraInfo(); - for (int i = 0; i < cameraCount; i++) { Camera.getCameraInfo(i, cameraInfo); switch (cameraInfo.facing) {