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

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

Merge "Fix the memory leak during high speed recording" am: 047ddc36 

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



Change-Id: I37d0b69293a408a556b4f37e253459fd77208788
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d682d6c 047ddc36

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

+6 −0
Original line number Diff line number Diff line
@@ -2231,6 +2231,12 @@ public class CameraDeviceImpl extends CameraDevice 
                } else {

                    List<CaptureResult> partialResults =

                            mFrameNumberTracker.popPartialResults(frameNumber);

                    if (mBatchOutputMap.containsKey(requestId)) {

                        int requestCount = mBatchOutputMap.get(requestId);

                        for (int i = 1; i < requestCount; i++) {

                            mFrameNumberTracker.popPartialResults(frameNumber - (requestCount - i));

                        }

                    }



                    final long sensorTimestamp =

                            result.get(CaptureResult.SENSOR_TIMESTAMP);