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

Commit ad63d28c authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix null pointer exception in onResultReceived" into... 

Merge "Camera: Fix null pointer exception in onResultReceived" into udc-qpr-dev am: 4c3db108 am: 60d71278

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



Change-Id: Ie93142f45173993826f1ca123025816ac6df457a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae6c1219 60d71278

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

+2 −9
Original line number Diff line number Diff line
@@ -1149,11 +1149,7 @@ public class CameraDeviceImpl extends CameraDevice 
                            "remove holder for requestId %d, "

                            + "because lastFrame is %d.",

                            requestId, lastFrameNumber));

                }

            }



            if (holder != null) {

                if (DEBUG) {

                    Log.v(TAG, "immediately trigger onCaptureSequenceAborted because"

                            + " request did not reach HAL");

                }
@@ -2180,11 +2176,9 @@ public class CameraDeviceImpl extends CameraDevice 


                final CaptureCallbackHolder holder =

                        CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);

                final CaptureRequest request = holder.getRequest(resultExtras.getSubsequenceId());



                boolean isPartialResult =

                        (resultExtras.getPartialResultCount() < mTotalPartialCount);

                int requestType = request.getRequestType();



                // Check if we have a callback for this

                if (holder == null) {
@@ -2194,12 +2188,11 @@ public class CameraDeviceImpl extends CameraDevice 
                                        + frameNumber);

                    }



                    updateTracker(requestId, frameNumber, requestType, /*result*/null,

                            isPartialResult);



                    return;

                }



                final CaptureRequest request = holder.getRequest(resultExtras.getSubsequenceId());

                int requestType = request.getRequestType();

                if (isClosed()) {

                    if (DEBUG) {

                        Log.d(TAG,