summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriele M <moto.falcon.git@gmail.com>2017-10-01 18:37:38 +0200
committerGabriele M <moto.falcon.git@gmail.com>2017-10-15 14:01:28 +0000
commit91a8a10d32bbed87e84ac84ec42838d0a034a369 (patch)
tree1bf86b674abc854438f5750752cba027129bb153
parent119d7744e1ba7c9871ccb82c54b74df5e2065338 (diff)
downloadandroid_packages_apps_Eleven-91a8a10d32bbed87e84ac84ec42838d0a034a369.tar.gz
android_packages_apps_Eleven-91a8a10d32bbed87e84ac84ec42838d0a034a369.tar.bz2
android_packages_apps_Eleven-91a8a10d32bbed87e84ac84ec42838d0a034a369.zip
Eleven: Fix potential NPE when media server crashes
If the service doesn't exist when the media server crashes, Eleven will crash when creating the TrackErrorInfo object. The SERVER_DIED message is processed only when the service is not null, so just ignore the MEDIA_ERROR_SERVER_DIED message if service is null. BUGBASH-1045 Change-Id: Idaf3e238eefd412ebb85244b48ad7b20bc049ff0
-rw-r--r--src/com/cyanogenmod/eleven/MusicPlaybackService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/eleven/MusicPlaybackService.java b/src/com/cyanogenmod/eleven/MusicPlaybackService.java
index 869ee6e..eedf555 100644
--- a/src/com/cyanogenmod/eleven/MusicPlaybackService.java
+++ b/src/com/cyanogenmod/eleven/MusicPlaybackService.java
@@ -3442,6 +3442,9 @@ public class MusicPlaybackService extends Service {
switch (what) {
case MediaPlayer.MEDIA_ERROR_SERVER_DIED:
final MusicPlaybackService service = mService.get();
+ if (service == null) {
+ return false;
+ }
final TrackErrorInfo errorInfo = new TrackErrorInfo(service.getAudioId(),
service.getTrackName());