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

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
Simplified filter conditional
  • Loading branch information
@camsim99
camsim99 committed Oct 6, 2021
commit b0ff1148186c2498e19f22f45251ac65a894b7e6
39 changes: 20 additions & 19 deletions 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,27 +97,28 @@ 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) {
HashMap<String, Object> details = new HashMap<>();
CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
details.put("name", cameraName);
int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
details.put("sensorOrientation", sensorOrientation);
if (Integer.parseInt(cameraName, 10) < 0) {
continue;
}
HashMap<String, Object> details = new HashMap<>();
CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(cameraName);
details.put("name", cameraName);
int sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
details.put("sensorOrientation", sensorOrientation);

int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
switch (lensFacing) {
case CameraMetadata.LENS_FACING_FRONT:
details.put("lensFacing", "front");
break;
case CameraMetadata.LENS_FACING_BACK:
details.put("lensFacing", "back");
break;
case CameraMetadata.LENS_FACING_EXTERNAL:
details.put("lensFacing", "external");
break;
}
cameras.add(details);
int lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING);
switch (lensFacing) {
case CameraMetadata.LENS_FACING_FRONT:
details.put("lensFacing", "front");
break;
case CameraMetadata.LENS_FACING_BACK:
details.put("lensFacing", "back");
break;
case CameraMetadata.LENS_FACING_EXTERNAL:
details.put("lensFacing", "external");
break;
}
cameras.add(details);
}
return cameras;
}
Expand Down