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

This commit is contained in:
TreeHugger Robot
2023-01-16 03:43:42 +00:00
committed by Android (Google) Code Review

View File

@@ -2336,15 +2336,6 @@ 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