From fcbb46f9a896fd86906ab4b23f7b5de0924258e8 Mon Sep 17 00:00:00 2001
From: Ranjith Kagathi Ananda <ranjith@codeaurora.org>
Date: Tue, 23 Sep 2014 23:13:40 -0700
Subject: Camera: 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 regual .open call.

Change-Id: Iec16c0b4e30f431bff4f4ad8bb83533f328c12b4
---
 src/com/android/camera/AndroidCameraManagerImpl.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

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;
 
-- 
cgit v1.2.3