commit 1f48f4cf893c6463042f5ff81d5a7ee86348b60c
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 20 09:11:28 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Aug 20 09:11:29 2012 -0700
tree 2dcf8bccb821c3f205fc6202f972a1d5e491e390
parent 16c9ad253c8f1e30b543847b10a312d908f9de5d
parent 4732e676e10f22796826dabb916645808561c82a

Merge "Null pointer protection in AudioPreview.java for Music app"

src/com/android/music/AudioPreview.java

diff --git a/src/com/android/music/AudioPreview.java b/src/com/android/music/AudioPreview.java
old mode 100644
new mode 100755
index 846ed14..3f22c6c
--- a/src/com/android/music/AudioPreview.java
+++ b/src/com/android/music/AudioPreview.java
@@ -333,6 +333,10 @@
             if (!fromuser) {
                 return;
             }
+            // Protection for case of simultaneously tapping on seek bar and exit
+            if (mPlayer == null) {
+                return;
+            }
             mPlayer.seekTo(progress);
         }
         public void onStopTrackingTouch(SeekBar bar) {
@@ -352,6 +356,10 @@
     }
 
     public void playPauseClicked(View v) {
+        // Protection for case of simultaneously tapping on play/pause and exit
+        if (mPlayer == null) {
+            return;
+        }
         if (mPlayer.isPlaying()) {
             mPlayer.pause();
         } else {