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

Commit a8a2f257 authored by Michelle Ho's avatar Michelle Ho
Browse files

RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable 

When onCameraAvailable invoked for a logical multi-camera, all of the
physical cameras of a logical multi-camera are default available (i.e.,
no onPhysicalCameraAvailable would be called). So if some specific
physical cameras are unavailable, onPhysicalCameraUnavailable should be
invoked after onCameraAvailable.

Bug: 262979670
Test: atest CameraManagerTest
Change-Id: I77d32cd1d1c5a6c63950961724af7b41f8cdf1e6
parent 1d2eb783

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

+9 −0
Original line number Diff line number Diff line
@@ -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