diff options
| author | Ranjith Kagathi Ananda <ranjith@codeaurora.org> | 2014-09-23 23:13:40 -0700 |
|---|---|---|
| committer | Ranjith Kagathi Ananda <ranjith@codeaurora.org> | 2014-10-08 16:04:21 -0700 |
| commit | fcbb46f9a896fd86906ab4b23f7b5de0924258e8 (patch) | |
| tree | a2c529091a588d2977f45ce1a6f5dc5d7d6c4cd1 /src/com/android/camera/AndroidCameraManagerImpl.java | |
| parent | 2690a557364b1cfcff49b12eedb40b37e16d9393 (diff) | |
| download | android_packages_apps_Snap-fcbb46f9a896fd86906ab4b23f7b5de0924258e8.tar.gz android_packages_apps_Snap-fcbb46f9a896fd86906ab4b23f7b5de0924258e8.tar.bz2 android_packages_apps_Snap-fcbb46f9a896fd86906ab4b23f7b5de0924258e8.zip | |
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
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
| -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; |