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

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

Browse Source
This commit is contained in:
Michelle Ho
2023-02-01 02:28:13 +00:00
committed by Android (Google) Code Review
parent 608b9ec7bb a8a2f257cc
commit 701ed79631
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

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