RESTRICT AUTOMERGE Camera: Fix missing onPhysicalCameraUnavailable am: a8a2f257cc

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

Change-Id: I4b84b0432ac142727b798964f2e4a21647c85be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michelle Ho
2023-02-01 03:10:04 +00:00
committed by Automerger Merge Worker

View File

@@ -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