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

Commit 77a04b3d authored by Michelle Ho's avatar Michelle Ho Committed by Automerger Merge Worker
Browse files

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

Merge "Camera: Fix missing onPhysicalCameraUnavailable" into tm-qpr-dev am: c00c6663 am: 0f99e452

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



Change-Id: I498d1ad60c369d416c0b9c7e992f5398bb526e59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e4016361 0f99e452

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

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