Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I19103f7ed955a6158ebdd68a360381d8eea4f809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michelle Ho
2023-01-12 03:39:19 +00:00
committed by Automerger Merge Worker
parent fb1d774b27 c00c666389
commit 0f99e4527c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/hardware/camera2/CameraManager.java
View File

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