fix(android): return empty array rather than null for Ti.Media.availa…

…bleCameras if no cameras
tidev · Nov 2, 2020 · 48006b6 · 48006b6
1 parent c6ce7d6
commit 48006b6
Showing 1 changed file with 3 additions and 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
@@ -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) {