diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-06 01:29:21 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-06 01:29:21 -0700 |
commit | a56f1aa5e1e25f0132c2db533413bd671156c312 (patch) | |
tree | 24c9fdb0b96189d03a387e445cde3890b5283ab6 /src/com/android/gallery3d | |
parent | 44fba2a3719737b4aca0cd4ed7fbac77539a971d (diff) | |
parent | 854893db2acad26a877a2d9c7061d0f3768f61bf (diff) | |
download | android_packages_apps_Gallery2-a56f1aa5e1e25f0132c2db533413bd671156c312.tar.gz android_packages_apps_Gallery2-a56f1aa5e1e25f0132c2db533413bd671156c312.tar.bz2 android_packages_apps_Gallery2-a56f1aa5e1e25f0132c2db533413bd671156c312.zip |
Merge "Gallery: fix a memory leak" into android_ui.lnx.1.2-dev
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index 720c50428..47c9b128a 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -694,12 +694,14 @@ public class MoviePlayer implements } if (mMovieItem.getError()) { Log.w(TAG, "error occured, exit the video player!"); + mHandler.removeCallbacksAndMessages(null); mActivityContext.finish(); return; } if (mPlayerExt.getLoop()) { onReplay(); } else { //original logic + mHandler.removeCallbacksAndMessages(null); mTState = TState.COMPELTED; if (mCanReplay) { mController.showEnded(); |