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

Commit c00c6663 authored by Michelle Ho's avatar Michelle Ho Committed by Android (Google) Code Review
Browse files

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

parents f0f951f7 08c0efb0

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

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