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

Merge "Camera: Fix physical camera availability update" into tm-qpr-dev am: 608b9ec7bb

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

Change-Id: Ibcd43666c50069da9a04ac22017aed5e178c4808
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:09:15 +00:00
committed by Automerger Merge Worker
parent 02249fa75a 608b9ec7bb
commit 14048f1d8f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2378,9 +2378,8 @@ public final class CameraManager {
} }
//TODO: Do we need to treat this as error? //TODO: Do we need to treat this as error?
if (!mDeviceStatus.containsKey(id) || !isAvailable(mDeviceStatus.get(id)) if (!mDeviceStatus.containsKey(id) || !mUnavailablePhysicalDevices.containsKey(id)) {
|| !mUnavailablePhysicalDevices.containsKey(id)) { Log.e(TAG, String.format("Camera %s is not present. Ignore physical camera "
Log.e(TAG, String.format("Camera %s is not available. Ignore physical camera "
+ "status change", id)); + "status change", id));
return; return;
} }
@@ -2405,6 +2404,12 @@ public final class CameraManager {
return; return;
} }
if (!isAvailable(mDeviceStatus.get(id))) {
Log.i(TAG, String.format("Camera %s is not available. Ignore physical camera "
+ "status change callback(s)", id));
return;
}
final int callbackCount = mCallbackMap.size(); final int callbackCount = mCallbackMap.size();
for (int i = 0; i < callbackCount; i++) { for (int i = 0; i < callbackCount; i++) {
Executor executor = mCallbackMap.valueAt(i); Executor executor = mCallbackMap.valueAt(i);