diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-29 08:21:18 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-29 08:21:18 -0400 |
| commit | 041e7bbb088f562ee2f0a410b4e72771a952f92b (patch) | |
| tree | e788321f0b98c657672d92210101a25aa563d8ae /core | |
| parent | 0d212e1c0e6bf9c190920e33f48235a6bef14005 (diff) | |
| parent | 55cc2a0d2dc384b3f42a3d7fe4384d078bc3b877 (diff) | |
| download | AntennaPod-041e7bbb088f562ee2f0a410b4e72771a952f92b.zip | |
Merge pull request #1143 from mfietz/issue/1130
Resume playback when bluetooth device is reconnected
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 3ec519844..f5b000abf 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.BLUETOOTH" /> <application android:allowBackup="true" diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index 7e3f27856..f6ea38ab5 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -4,6 +4,8 @@ import android.annotation.SuppressLint; import android.app.Notification; import android.app.PendingIntent; import android.app.Service; +import android.bluetooth.BluetoothA2dp; +import android.bluetooth.BluetoothHeadset; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -230,7 +232,7 @@ public class PlaybackService extends Service { registerReceiver(shutdownReceiver, new IntentFilter( ACTION_SHUTDOWN_PLAYBACK_SERVICE)); registerReceiver(bluetoothStateUpdated, new IntentFilter( - AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)); + BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED)); registerReceiver(audioBecomingNoisy, new IntentFilter( AudioManager.ACTION_AUDIO_BECOMING_NOISY)); registerReceiver(skipCurrentEpisodeReceiver, new IntentFilter( @@ -1082,10 +1084,9 @@ public class PlaybackService extends Service { private BroadcastReceiver bluetoothStateUpdated = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (StringUtils.equals(intent.getAction(), AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)) { - int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, -1); - int prevState = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_PREVIOUS_STATE, -1); - if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) { + if (StringUtils.equals(intent.getAction(), BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED)) { + int state = intent.getIntExtra(BluetoothA2dp.EXTRA_STATE, -1); + if (state == BluetoothA2dp.STATE_CONNECTED) { Log.d(TAG, "Received bluetooth connection intent"); unpauseIfPauseOnDisconnect(); } |