RESTRICT AUTOMERGE Revert "Camera: Fix missing onPhysicalCameraUnavailable" am: 7d31f878a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20979024 Change-Id: Id31b45622e46dbf240211c764bf7c969bbe77455 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2342,15 +2342,6 @@ 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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user