diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-13 03:25:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-13 03:25:14 -0700 |
| commit | d7810337255f08f3c89e2fb02ca393fc2997ca8d (patch) | |
| tree | 8a34b6f649194aee51337a16b8a03bc97abe49e6 | |
| parent | 9aa0b4af98c821b032b2ff708dda2034ba401e52 (diff) | |
| parent | fcbb46f9a896fd86906ab4b23f7b5de0924258e8 (diff) | |
| download | android_packages_apps_Snap-d7810337255f08f3c89e2fb02ca393fc2997ca8d.tar.gz android_packages_apps_Snap-d7810337255f08f3c89e2fb02ca393fc2997ca8d.tar.bz2 android_packages_apps_Snap-d7810337255f08f3c89e2fb02ca393fc2997ca8d.zip | |
Merge "Camera: openLegacy to open HAL1 camera"
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 637a5f5c5..42ae20f02 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -201,7 +201,14 @@ class AndroidCameraManagerImpl implements CameraManager { try { switch (msg.what) { case OPEN_CAMERA: - mCamera = android.hardware.Camera.open(msg.arg1); + try { + mCamera = android.hardware.Camera.openLegacy(msg.arg1, + android.hardware.Camera.CAMERA_HAL_API_VERSION_1_0); + } catch (RuntimeException e) { + /* Retry with open if openLegacy fails */ + Log.v(TAG, "openLegacy failed. Using open instead"); + mCamera = android.hardware.Camera.open(msg.arg1); + } if (mCamera != null) { mParametersIsDirty = true; |