diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-24 19:52:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-24 19:52:29 -0700 |
| commit | 9f4c5fa739df79b665a35f5eb68e5e57079f0729 (patch) | |
| tree | 4232b67202ad924ec7a1207c137e36f3687082a0 /src | |
| parent | 05239cd620c1594d5a04de75082baf78d646b403 (diff) | |
| parent | b9f40827d78b6e1014b886f984f9d0ed6a230e88 (diff) | |
| download | android_packages_apps_Snap-9f4c5fa739df79b665a35f5eb68e5e57079f0729.tar.gz android_packages_apps_Snap-9f4c5fa739df79b665a35f5eb68e5e57079f0729.tar.bz2 android_packages_apps_Snap-9f4c5fa739df79b665a35f5eb68e5e57079f0729.zip | |
Merge "SnapdragonCamera:Fix ZSL leak" into camera-SnapdragonCamera.lnx.2.0
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) { |