Merge "Messaging app crashed after playing a slide show" into klp-dev

1 files changed, 6 insertions, 4 deletions

diff --git a/src/com/android/mms/ui/SlideshowActivity.java b/src/com/android/mms/ui/SlideshowActivity.java
index 1fb62473..a2874247 100644
--- a/src/com/android/mms/ui/SlideshowActivity.java
+++ b/src/com/android/mms/ui/SlideshowActivity.java
@@ -285,11 +285,13 @@ public class SlideshowActivity extends Activity implements EventListener {
                 mSmilPlayer.stopWhenReload();
             }
             if (mMediaController != null) {
-                // Must set the seek bar change listener null,otherwise if we rotate it
-                // during tap progress bar continuously,window will leak
-                SeekBar seeker = (SeekBar) mMediaController
+                // Must set the seek bar change listener null, otherwise if we rotate it
+                // while tapping progress bar continuously, window will leak.
+                View seekBar = mMediaController
                         .findViewById(com.android.internal.R.id.mediacontroller_progress);
-                seeker.setOnSeekBarChangeListener(null);
+                if (seekBar instanceof SeekBar) {
+                    ((SeekBar)seekBar).setOnSeekBarChangeListener(null);
+                }
                 // Must do this so we don't leak a window.
                 mMediaController.hide();
             }