Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[camera] Add filter for unsupported cameras on Android #4418

Merged
merged 5 commits into from
Oct 7, 2021
Merged

[camera] Add filter for unsupported cameras on Android #4418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb0664c
Add filter for cameras and corresponding test
camsim99 Oct 6, 2021
7f2bbd6
Fix sensorOrientation,lensFacing when/thenReturns, format files
camsim99 Oct 6, 2021
b0ff114
Simplified filter conditional
camsim99 Oct 6, 2021
00792c3
Added parseInt error handling
camsim99 Oct 6, 2021
46daf88
Changed Exception type
camsim99 Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added parseInt error handling
  • Loading branch information
@camsim99
camsim99 committed Oct 6, 2021
commit 00792c3b0c6bc948d0deb0de28ac27258bc08d6e
9 changes: 8 additions & 1 deletion packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,16 @@ public static List<Map<String, Object>> getAvailableCameras(Activity activity)
String[] cameraNames = cameraManager.getCameraIdList();
List<Map<String, Object>> cameras = new ArrayList<>();
for (String cameraName : cameraNames) {
if (Integer.parseInt(cameraName, 10) < 0) {
int cameraId;
try {
cameraId = Integer.parseInt(cameraName, 10);
} catch (Exception e) {
cameraId = -1;
}
if (cameraId < 0) {
continue;
}

HashMap<String, Object> details = new HashMap<>();
CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
details.put("name", cameraName);
Expand Down
5 changes: 3 additions & 2 deletions packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ public void deserializeDeviceOrientation_throwsForNull() {
}

@Test
public void getAvailableCameras_retrievesValidCameras() throws CameraAccessException {
public void getAvailableCameras_retrievesValidCameras()
throws CameraAccessException, NumberFormatException {
final Activity mockActivity = mock(Activity.class);
final CameraManager mockCameraManager = mock(CameraManager.class);
final CameraCharacteristics mockCameraCharacteristics = mock(CameraCharacteristics.class);
final String[] mockCameraIds = {"1394902", "-192930", "0283835"};
final String[] mockCameraIds = {"1394902", "-192930", "0283835", "foobar"};
final int mockSensorOrientation0 = 90;
final int mockSensorOrientation2 = 270;
final int mockLensFacing0 = CameraMetadata.LENS_FACING_FRONT;
Expand Down