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

Merge "Camera: Avoid possible NPE after extension session configuration" am: 8c53fa447b am: 146fe44f90

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

Change-Id: I127a87ec81162450232abee354081389947ee806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-14 18:43:57 +00:00
committed by Automerger Merge Worker
parent a56f46adce 146fe44f90
commit aec1b4622e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
View File

@@ -528,8 +528,15 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes
boolean status = true; boolean status = true;
synchronized (mInterfaceLock) { synchronized (mInterfaceLock) {
try { try {
if (mSessionProcessor != null) {
mSessionProcessor.onCaptureSessionStart(mRequestProcessor); mSessionProcessor.onCaptureSessionStart(mRequestProcessor);
mInitialized = true; mInitialized = true;
} else {
Log.v(TAG, "Failed to start capture session, session released before " +
"extension start!");
status = false;
mCaptureSession.close();
}
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to start capture session," Log.e(TAG, "Failed to start capture session,"
+ " extension service does not respond!"); + " extension service does not respond!");