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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-01 17:48:28 +00:00
committed by Android (Google) Code Review
parent 530bbf8d42 671d613bcb
commit 8f42b2f8d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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