diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-09-30 22:15:09 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-09-30 22:15:09 -0700 |
| commit | ab9201c69824c83a2dd561d0dc221cffa78ee664 (patch) | |
| tree | cdd8e30a7f58a45ce88d296226aed97a1ebad447 | |
| parent | a8d01a371790f1ac49f2eec4e99c208ae3272b17 (diff) | |
| download | android_packages_apps_Eleven-ab9201c69824c83a2dd561d0dc221cffa78ee664.tar.gz android_packages_apps_Eleven-ab9201c69824c83a2dd561d0dc221cffa78ee664.tar.bz2 android_packages_apps_Eleven-ab9201c69824c83a2dd561d0dc221cffa78ee664.zip | |
eleven: Fix crash when unplugging headphones
* Don't crash if the handler was never created.
Change-Id: I22aedbf5e912e086db04bbb0dc09d7434dba99b9
| -rw-r--r-- | src/com/cyanogenmod/eleven/MusicPlaybackService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/eleven/MusicPlaybackService.java b/src/com/cyanogenmod/eleven/MusicPlaybackService.java index 64a131e..9a064d1 100644 --- a/src/com/cyanogenmod/eleven/MusicPlaybackService.java +++ b/src/com/cyanogenmod/eleven/MusicPlaybackService.java @@ -2502,7 +2502,9 @@ public class MusicPlaybackService extends Service { public void pause() { if (D) Log.d(TAG, "Pausing playback"); synchronized (this) { - mPlayerHandler.removeMessages(FADEUP); + if (mPlayerHandler != null) { + mPlayerHandler.removeMessages(FADEUP); + } if (mIsSupposedToBePlaying) { final Intent intent = new Intent( AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION); @@ -2510,7 +2512,9 @@ public class MusicPlaybackService extends Service { intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName()); sendBroadcast(intent); - mPlayer.pause(); + if (mPlayer != null) { + mPlayer.pause(); + } setIsSupposedToBePlaying(false, true); stopShakeDetector(false); } |