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

Commit 4b31ff28 authored by Michelle Ho's avatar Michelle Ho Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable am: a8a2f257 

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



Change-Id: I4b84b0432ac142727b798964f2e4a21647c85be9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14048f1d a8a2f257

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -2359,6 +2359,15 @@ public final class CameraManager { 
                final AvailabilityCallback callback = mCallbackMap.keyAt(i);

                final AvailabilityCallback callback = mCallbackMap.keyAt(i);





                postSingleUpdate(callback, executor, id, null /*physicalId*/, status);

                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

        } // onStatusChangedLocked