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

Commit 937c4dbb authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev

parents 73b1d94b d8c21e8b

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -244,11 +244,7 @@ public final class CameraManager { 
                            USE_CALLING_UID, holder);

                            USE_CALLING_UID, holder);

                    cameraUser = ICameraDeviceUser.Stub.asInterface(holder.getBinder());

                    cameraUser = ICameraDeviceUser.Stub.asInterface(holder.getBinder());

                } catch (CameraRuntimeException e) {

                } catch (CameraRuntimeException e) {

                    if (e.getReason() == CameraAccessException.CAMERA_DEPRECATED_HAL) {

                    if (e.getReason() == CameraAccessException.CAMERA_IN_USE ||

                        // 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 ||

                            e.getReason() == CameraAccessException.MAX_CAMERAS_IN_USE ||

                            e.getReason() == CameraAccessException.MAX_CAMERAS_IN_USE ||

                            e.getReason() == CameraAccessException.CAMERA_DISABLED ||

                            e.getReason() == CameraAccessException.CAMERA_DISABLED ||

                            e.getReason() == CameraAccessException.CAMERA_DISCONNECTED ||

                            e.getReason() == CameraAccessException.CAMERA_DISCONNECTED ||