Merge "RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable" into tm-qpr-dev

2023-02-01 02:28:13 +00:00
parent 608b9ec7bb a8a2f257cc
commit 701ed79631
1 changed files with 9 additions and 0 deletions
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -2353,6 +2353,15 @@ public final class CameraManager {
                final AvailabilityCallback callback = mCallbackMap.keyAt(i);

                postSingleUpdate(callback, executor, id, null /*physicalId*/, status);
+
+                // Send the NOT_PRESENT state for unavailable physical cameras
+                if (isAvailable(status) && mUnavailablePhysicalDevices.containsKey(id)) {
+                    ArrayList<String> unavailableIds = mUnavailablePhysicalDevices.get(id);
+                    for (String unavailableId : unavailableIds) {
+                        postSingleUpdate(callback, executor, id, unavailableId,
+                                ICameraServiceListener.STATUS_NOT_PRESENT);
+                    }
+                }
            }
        } // onStatusChangedLocked