diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-06-11 00:09:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 22:18:15 +0000 |
| commit | 937c4dbb1fdc1afcdc3c4b57d6799d1f49acf9f0 (patch) | |
| tree | ced58231232f79104bc86cc294825d4d776e8384 /core/java/android/hardware | |
| parent | 73b1d94baf9dcd75bd61beed07a3984c70fdc3f1 (diff) | |
| parent | d8c21e8bd09658f5843712f0176db3517ba44c51 (diff) | |
| download | frameworks_base-937c4dbb1fdc1afcdc3c4b57d6799d1f49acf9f0.zip frameworks_base-937c4dbb1fdc1afcdc3c4b57d6799d1f49acf9f0.tar.gz frameworks_base-937c4dbb1fdc1afcdc3c4b57d6799d1f49acf9f0.tar.bz2 | |
Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index e7c9ee3..a69a813 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -244,11 +244,7 @@ public final class CameraManager { USE_CALLING_UID, holder); cameraUser = ICameraDeviceUser.Stub.asInterface(holder.getBinder()); } catch (CameraRuntimeException e) { - if (e.getReason() == CameraAccessException.CAMERA_DEPRECATED_HAL) { - // Use legacy camera implementation for HAL1 devices - Log.i(TAG, "Using legacy camera HAL."); - cameraUser = CameraDeviceUserShim.connectBinderShim(callbacks, id); - } else if (e.getReason() == CameraAccessException.CAMERA_IN_USE || + if (e.getReason() == CameraAccessException.CAMERA_IN_USE || e.getReason() == CameraAccessException.MAX_CAMERAS_IN_USE || e.getReason() == CameraAccessException.CAMERA_DISABLED || e.getReason() == CameraAccessException.CAMERA_DISCONNECTED || |