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

Commit 345b26d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix camera id equal check" into main am: 237b6c21 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3201770



Change-Id: I2d8b8b6e855b2d584f90de240157b4bfa4ba07d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88854a8e 237b6c21

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ public class CameraDeviceImpl extends CameraDevice 
            checkIfCameraClosedOrInError();



            for (String physicalId : physicalCameraIdSet) {

                if (physicalId == getId()) {

                if (Objects.equals(physicalId, getId())) {

                    throw new IllegalStateException("Physical id matches the logical id!");

                }

            }