diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-06 11:42:06 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-06 11:42:06 -0800 |
commit | a408254edf4ce48ce0cec7ca752f98b207f1c326 (patch) | |
tree | 47d3cfc7d0bda3a66a3e7d866705645b06c4ba9f | |
parent | 2d894ed368689085e89b6f0b79fb355575267e97 (diff) | |
parent | b20392bc4c407df78ee969d60c88ca8fa176e6c8 (diff) | |
download | android_packages_apps_Snap-a408254edf4ce48ce0cec7ca752f98b207f1c326.tar.gz android_packages_apps_Snap-a408254edf4ce48ce0cec7ca752f98b207f1c326.tar.bz2 android_packages_apps_Snap-a408254edf4ce48ce0cec7ca752f98b207f1c326.zip |
Merge "SnapdragonCamera: 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 408bf4f55..b2d7c7681 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; |