summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/AndroidCameraManagerImpl.java
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2014-11-26 19:07:08 +0530
committerSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2014-11-26 19:20:01 +0530
commit0d33346534a728a1f8efaec05fcdccbe3e5440e1 (patch)
tree1534c26bcae18008739306121e639a5e30797016 /src/com/android/camera/AndroidCameraManagerImpl.java
parent5d09f62dd4aa43c3cdd1f0b1e6cd9145c2021879 (diff)
downloadandroid_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.tar.gz
android_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.tar.bz2
android_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.zip
SnapdragonCamera: Fix compatibility issues with KK.
1. Remove openLegacy call to open camera. 2. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 3. Fix NPE during startpreview if mParameters is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
-rw-r--r--src/com/android/camera/AndroidCameraManagerImpl.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 42ae20f02..637a5f5c5 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -201,14 +201,7 @@ class AndroidCameraManagerImpl implements CameraManager {
try {
switch (msg.what) {
case OPEN_CAMERA:
- 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);
- }
+ mCamera = android.hardware.Camera.open(msg.arg1);
if (mCamera != null) {
mParametersIsDirty = true;