OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore exceptions from getSupportedPreviewFpsRange
[android-x86/frameworks-base.git]
/
core
/
java
/
android
/
hardware
/
camera2
/
legacy
/
LegacyMetadataMapper.java
diff --git
a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
index
bb0a042
..
1a3b1f1
100644
(file)
--- a/
core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/
core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@
-405,7
+405,7
@@
public class LegacyMetadataMapper {
/*
* control.aeAvailableTargetFpsRanges
*/
/*
* control.aeAvailableTargetFpsRanges
*/
- {
+
try
{
List<int[]> fpsRanges = p.getSupportedPreviewFpsRange();
if (fpsRanges == null) {
throw new AssertionError("Supported FPS ranges cannot be null.");
List<int[]> fpsRanges = p.getSupportedPreviewFpsRange();
if (fpsRanges == null) {
throw new AssertionError("Supported FPS ranges cannot be null.");
@@
-422,6
+422,8
@@
public class LegacyMetadataMapper {
(int) Math.ceil(r[Camera.Parameters.PREVIEW_FPS_MAX_INDEX] / 1000.0));
}
m.set(CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES, ranges);
(int) Math.ceil(r[Camera.Parameters.PREVIEW_FPS_MAX_INDEX] / 1000.0));
}
m.set(CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES, ranges);
+ } catch (Exception e) {
+ Log.d(TAG, "ignore any error from getSupportedPreviewFpsRange: ", e);
}
/*
}
/*