diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-06-09 18:47:14 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-06-10 19:45:43 +0000 |
| commit | d8c21e8bd09658f5843712f0176db3517ba44c51 (patch) | |
| tree | 870a238dd15cdf2d2a16b6852c35016923bdd885 /core/java/android | |
| parent | 096fc544af23957d5575725ca457c3d0df498055 (diff) | |
| download | frameworks_base-d8c21e8bd09658f5843712f0176db3517ba44c51.zip frameworks_base-d8c21e8bd09658f5843712f0176db3517ba44c51.tar.gz frameworks_base-d8c21e8bd09658f5843712f0176db3517ba44c51.tar.bz2 | |
DO NOT MERGE: camera2: Disallow shim usage for preview.
Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
Diffstat (limited to 'core/java/android')
| -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 9046b13..cd8b594 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 || |