Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c21e8b authored by Ruben Brunk's avatar Ruben Brunk
Browse files

DO NOT MERGE: camera2: Disallow shim usage for preview. 

Bug: 15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710
parent 096fc544

core/java/android/hardware/camera2/CameraManager.java

+1 −5
Original line number Diff line number Diff line
@@ -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 ||