diff options
| author | Sol Boucher <solb@google.com> | 2014-08-23 01:29:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-23 01:29:54 +0000 |
| commit | d6a52ce7b43f15fc931038133b4fea821e9f3b9f (patch) | |
| tree | 19a03ae31ca197e3511978d1e93651f42fde751f /camera2 | |
| parent | 6ca06f3f9ed8807b37e592790e09041f36a0f284 (diff) | |
| parent | f2b5a976bb1c30f83682a996ce9289a973c88784 (diff) | |
| download | android_frameworks_ex-d6a52ce7b43f15fc931038133b4fea821e9f3b9f.tar.gz android_frameworks_ex-d6a52ce7b43f15fc931038133b4fea821e9f3b9f.tar.bz2 android_frameworks_ex-d6a52ce7b43f15fc931038133b4fea821e9f3b9f.zip | |
Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
Diffstat (limited to 'camera2')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java index 6a4c72c..3dc19f7 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java @@ -720,9 +720,16 @@ public class CameraCapabilities { private boolean focusCheck(final CameraSettings settings) { FocusMode focusMode = settings.getCurrentFocusMode(); if (!supports(focusMode)) { - Log.v(TAG, - "Focus mode not supported:" + (focusMode != null ? focusMode.name() : "null")); - return false; + if (supports(FocusMode.FIXED)) { + // Workaround for devices whose templates define defaults they don't really support + // TODO: Remove workaround (b/17177436) + Log.w(TAG, "Focus mode not supported... trying FIXED"); + settings.setFocusMode(FocusMode.FIXED); + } else { + Log.v(TAG, "Focus mode not supported:" + + (focusMode != null ? focusMode.name() : "null")); + return false; + } } return true; } |