commit 237b6c21d8a614338259bfb78d1152e6ce332552
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 05 18:33:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 05 18:33:34 2024 +0000
tree 4b08c05e9c4cf4105139e187c93b165bba33df63
parent 43d59c53939c55689818a46b62e7828f21ec2523
parent 68dbf2de90eef662feb0f3a5ad4319ae098cb6fd

Merge "Camera: Fix camera id equal check" into main

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

diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
index 97c03ed..b909ab8 100644
--- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
@@ -849,7 +849,7 @@
             checkIfCameraClosedOrInError();
 
             for (String physicalId : physicalCameraIdSet) {
-                if (physicalId == getId()) {
+                if (Objects.equals(physicalId, getId())) {
                     throw new IllegalStateException("Physical id matches the logical id!");
                 }
             }