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

Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6

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

Change-Id: I7d641cea03f9f35889d0ebdcf66e9bf7a0f35609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-01 17:51:59 +00:00
committed by Automerger Merge Worker
parent 3c7ff59bc6 8f42b2f8d6
commit 5c002a64a5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
View File

@@ -1693,8 +1693,10 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession {
((i != idx) || notifyCurrentIndex)) {
TotalCaptureResult result = previewMap.valueAt(i).second;
Long timestamp = result.get(CaptureResult.SENSOR_TIMESTAMP);
mCaptureResultHandler.onCaptureCompleted(timestamp,
initializeFilteredResults(result));
if (mCaptureResultHandler != null) {
mCaptureResultHandler.onCaptureCompleted(timestamp,
initializeFilteredResults(result));
}
Log.w(TAG, "Preview frame drop with timestamp: " + previewMap.keyAt(i));
final long ident = Binder.clearCallingIdentity();