diff options
| author | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:17:13 +0800 |
|---|---|---|
| committer | jinwu <jinwu@codeaurora.org> | 2018-09-21 18:17:13 +0800 |
| commit | b9f40827d78b6e1014b886f984f9d0ed6a230e88 (patch) | |
| tree | 47d02e062fbb97329a24182023c4c71dab56e975 /src | |
| parent | a26301351c28e820f6c2346ebd07265cfed14c8b (diff) | |
| download | android_packages_apps_Snap-b9f40827d78b6e1014b886f984f9d0ed6a230e88.tar.gz android_packages_apps_Snap-b9f40827d78b6e1014b886f984f9d0ed6a230e88.tar.bz2 android_packages_apps_Snap-b9f40827d78b6e1014b886f984f9d0ed6a230e88.zip | |
SnapdragonCamera:Fix ZSL leak
When SelfieFlash enable,require flash
or long shot active, one imageItem will
be set to null without close. Close it
to avoid leak.
Change-Id: Ieb33d31e937ee07b278dceecb2f42a3047fbd12a
CRs-Fixed: 2297568
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/imageprocessor/PostProcessor.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index c227f32b2..ee01e6b27 100755 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -459,12 +459,18 @@ public class PostProcessor{ if(mController.getPreviewCaptureResult() == null || mController.getPreviewCaptureResult().get(CaptureResult.CONTROL_AE_STATE) == CameraMetadata.CONTROL_AE_STATE_FLASH_REQUIRED) { if(DEBUG_ZSL) Log.d(TAG, "Flash required image"); + if (imageItem != null) + imageItem.closeImage(); imageItem = null; } if (mController.isSelfieFlash()) { + if (imageItem != null) + imageItem.closeImage(); imageItem = null; } if (mController.isLongShotActive()) { + if (imageItem != null) + imageItem.closeImage(); imageItem = null; } if (imageItem != null) { |