summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRajaram Gudivada <rajaramg@codeaurora.org>2015-03-05 19:05:32 +0530
committerRajaram Gudivada <rajaramg@codeaurora.org>2015-03-05 19:05:32 +0530
commitb20392bc4c407df78ee969d60c88ca8fa176e6c8 (patch)
tree47d3cfc7d0bda3a66a3e7d866705645b06c4ba9f /src
parent2d894ed368689085e89b6f0b79fb355575267e97 (diff)
downloadandroid_packages_apps_Snap-b20392bc4c407df78ee969d60c88ca8fa176e6c8.tar.gz
android_packages_apps_Snap-b20392bc4c407df78ee969d60c88ca8fa176e6c8.tar.bz2
android_packages_apps_Snap-b20392bc4c407df78ee969d60c88ca8fa176e6c8.zip
SnapdragonCamera: openLegacy to open HAL1 camera
When HAL 3 module is enabled by default, use .openLegacy with api version CAMERA_HAL_API_VERSION_1_0 to get the HAL1 device instead of the regualar open call. Change-Id: I4637b1f03c56b461fcfa2d29fe8f1064c5cbb6b1
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java9
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;