| commit | b1c285c7e2da5492b4224f3e66ea5696b6df5fa8 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Wed Nov 07 15:44:01 2012 -0800 |
| committer | Glenn Kasten <gkasten@google.com> | Wed Nov 07 15:44:01 2012 -0800 |
| tree | dd7376523e8f8c047a1e640ef3ec64d8a32507a4 | |
| parent | edb522717440495e364f6a40198bd09e140bf501 [diff] |
Fix NPE when mediaserver dies Bug: 7497887 Change-Id: I92a1f332965da9462e2a063f2c1304a37a569384
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java index 6414eb4..0009b53 100644 --- a/src/com/android/music/MediaPlaybackService.java +++ b/src/com/android/music/MediaPlaybackService.java
@@ -1212,7 +1212,7 @@ } private void stop(boolean remove_status_icon) { - if (mPlayer.isInitialized()) { + if (mPlayer != null && mPlayer.isInitialized()) { mPlayer.stop(); } mFileToPlay = null;