diff options
| author | Igor Murashkin <iam@google.com> | 2013-10-07 22:38:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-07 22:38:37 +0000 |
| commit | 46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d (patch) | |
| tree | e1f73ec3070c3b39746a4de1a08dc2d86d5020bb /core/java/android/hardware | |
| parent | cade4089e75df2c9ef86aa1a37f3396e0d4b57d5 (diff) | |
| parent | e37885a8a319165592350e4c46df03c3544a7dc1 (diff) | |
| download | frameworks_base-46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d.zip frameworks_base-46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d.tar.gz frameworks_base-46ea9b0b0451a44fc30a646a6e1c4062f0b3d62d.tar.bz2 | |
Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraMetadataNative.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index eb82ed4..adccbc5 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -92,6 +92,15 @@ public class CameraMetadataNative extends CameraMetadata implements Parcelable { @SuppressWarnings("unchecked") @Override public <T> T get(Key<T> key) { + + if (key == CaptureResult.STATISTICS_FACES) { + /** + * FIXME: Workaround for HAL bug that's missing FACE_DETECT_MODE + */ + Log.w(TAG, "Expected non-null android.statistics.faceDetectMode"); + return null; + } + T value = getOverride(key); if (value != null) { return value; |