diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-03 12:59:51 +0200 |
---|---|---|
committer | Martin Fietz <Martin.Fietz@gmail.com> | 2016-06-03 12:59:51 +0200 |
commit | e1d8defa1fa114a96906aa60de74990a65c36ffc (patch) | |
tree | 74cd53b8ed0c574dfff44e8b669d8bb7e7e2ec36 /core/src/main/java | |
parent | f1b783978042355d9279ff0b109e2b5c3db857e3 (diff) | |
parent | eca8fc90b8a0a4cb6d83baa1277df8b391e634bb (diff) | |
download | AntennaPod-e1d8defa1fa114a96906aa60de74990a65c36ffc.zip |
Merge pull request #1977 from mfietz/issue/1973-controller-classcastex
Prevent onServiceConnected ClassCastException
Diffstat (limited to 'core/src/main/java')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 7870c747e..041831e80 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -258,14 +258,15 @@ public abstract class PlaybackController { private final ServiceConnection mConnection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { - playbackService = ((PlaybackService.LocalBinder) service) - .getService(); - if (!released) { - queryService(); - Log.d(TAG, "Connection to Service established"); - } else { - Log.i(TAG, "Connection to playback service has been established, " + - "but controller has already been released"); + if(service instanceof PlaybackService.LocalBinder) { + playbackService = ((PlaybackService.LocalBinder) service).getService(); + if (!released) { + queryService(); + Log.d(TAG, "Connection to Service established"); + } else { + Log.i(TAG, "Connection to playback service has been established, " + + "but controller has already been released"); + } } } |