Skip to content

Camera: Allow setting fallback physical ID for logical camera [2/2] #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kutemeikito wants to merge 1 commit into from
Closed

Camera: Allow setting fallback physical ID for logical camera [2/2] #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion core/java/android/hardware/camera2/CameraManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,20 @@ private Map<String, CameraCharacteristics> getPhysicalIdToCharsMap(
new HashMap<String, CameraCharacteristics>();
Set<String> physicalCameraIds = chars.getPhysicalCameraIds();
for (String physicalCameraId : physicalCameraIds) {
CameraCharacteristics physicalChars = getCameraCharacteristics(physicalCameraId);
CameraCharacteristics physicalChars;
try {
physicalChars = getCameraCharacteristics(physicalCameraId);
} catch (Exception e) {
final String fallbackId = SystemProperties.get(
"persist.sys.camera.fallback_id_" + physicalCameraId);
if (fallbackId.isEmpty()) {
throw e;
}
Log.w(TAG, "Could not retrieve camera " + physicalCameraId + " characteristics", e);
Log.i(TAG, "Trying fallback camera " + fallbackId);
// if this also fails, exception will be thrown
physicalChars = getCameraCharacteristics(fallbackId);
}
physicalIdsToChars.put(physicalCameraId, physicalChars);
}
return physicalIdsToChars;
Expand Down