diff options
| author | Sascha Haeberling <haeberling@google.com> | 2015-05-20 22:14:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-20 22:14:30 +0000 |
| commit | 818a4dd9e76de5b41e146fb460dadc0b77bca595 (patch) | |
| tree | 2f3081c14f60975ae518ae6899043f52b9ed5a29 | |
| parent | 5040b0f454bf740dfe9c11854e4596f80d46b224 (diff) | |
| parent | a344634f121d245d2096af445d3f4e5afe94f6f4 (diff) | |
| download | android_packages_apps_Camera2-818a4dd9e76de5b41e146fb460dadc0b77bca595.tar.gz android_packages_apps_Camera2-818a4dd9e76de5b41e146fb460dadc0b77bca595.tar.bz2 android_packages_apps_Camera2-818a4dd9e76de5b41e146fb460dadc0b77bca595.zip | |
am a344634f: am fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala
* commit 'a344634f121d245d2096af445d3f4e5afe94f6f4':
Don't attempt to update thumbnail if session is finished.
| -rw-r--r-- | src/com/android/camera/session/CaptureSessionImpl.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/session/CaptureSessionImpl.java b/src/com/android/camera/session/CaptureSessionImpl.java index 042c24bed..559f04074 100644 --- a/src/com/android/camera/session/CaptureSessionImpl.java +++ b/src/com/android/camera/session/CaptureSessionImpl.java @@ -174,6 +174,11 @@ public class CaptureSessionImpl implements CaptureSession { @Override public void updateThumbnail(Bitmap bitmap) { + // No placeholder present means the task might already be finished or + // cancelled. + if (mPlaceHolder == null) { + return; + } if (mImageLifecycleListener != null) { mImageLifecycleListener.onMediumThumb(); } |