Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b024f2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Avoid possible NPE after extension session configuration" am:... 

Merge "Camera: Avoid possible NPE after extension session configuration" am: 8c53fa44 am: 146fe44f am: aec1b462

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



Change-Id: I53d0d203917dddfd87f1aa34356f38609eb1aac1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 410d182c aec1b462

core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java

+9 −2
Original line number Diff line number Diff line
@@ -614,8 +614,15 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 
            boolean status = true;

            synchronized (mInterfaceLock) {

                try {

                    if (mSessionProcessor != null) {

                        mSessionProcessor.onCaptureSessionStart(mRequestProcessor);

                        mInitialized = true;

                    } else {

                        Log.v(TAG, "Failed to start capture session, session released before " +

                                "extension start!");

                        status = false;

                        mCaptureSession.close();

                    }

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to start capture session,"

                            + " extension service does not respond!");