diff options
| author | Senpo Hu <senpo@google.com> | 2014-12-22 16:46:22 -0800 |
|---|---|---|
| committer | Senpo Hu <senpo@google.com> | 2014-12-22 16:46:22 -0800 |
| commit | 68d834ff57c8e20a8c040cdcbf50d0e3332d6385 (patch) | |
| tree | 60d3b8e59e6323b544376921b3e7f20512cddf2a /src/com/android/camera/widget | |
| parent | 2db2f7917997f5aa67ddfd09a7cf7c8bd93d7d11 (diff) | |
| download | android_packages_apps_Camera2-68d834ff57c8e20a8c040cdcbf50d0e3332d6385.tar.gz android_packages_apps_Camera2-68d834ff57c8e20a8c040cdcbf50d0e3332d6385.tar.bz2 android_packages_apps_Camera2-68d834ff57c8e20a8c040cdcbf50d0e3332d6385.zip | |
Fix NPE crash in RoundedThumbnailView.
Bug: 18835171
Change-Id: Ib77e15cfeb93e3d73cf14e2459dfcdbe54d92073
Diffstat (limited to 'src/com/android/camera/widget')
| -rw-r--r-- | src/com/android/camera/widget/RoundedThumbnailView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/widget/RoundedThumbnailView.java b/src/com/android/camera/widget/RoundedThumbnailView.java index d90f549a0..f47781a30 100644 --- a/src/com/android/camera/widget/RoundedThumbnailView.java +++ b/src/com/android/camera/widget/RoundedThumbnailView.java @@ -352,9 +352,11 @@ public class RoundedThumbnailView extends View { // Stop currently running animators. if (mThumbnailAnimatorSet != null && mThumbnailAnimatorSet.isRunning()) { + mThumbnailAnimatorSet.removeAllListeners(); mThumbnailAnimatorSet.end(); } if (mRippleAnimator != null && mRippleAnimator.isRunning()) { + mRippleAnimator.removeAllListeners(); mRippleAnimator.end(); } // Remove all pending reveal requests. |