[android] don't stop shutting down the music service if anything happ…

…ens during broadcast to effect processors.
frostwire · Mar 4, 2016 · eb65e38 · eb65e38
1 parent 3876b97
commit eb65e38
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/android/apollo/src/com/andrew/apollo/MusicPlaybackService.java b/android/apollo/src/com/andrew/apollo/MusicPlaybackService.java
@@ -666,12 +666,15 @@ public void onPlaybackPositionUpdate(long newPositionMs) {
     public void onDestroy() {
         if (D) Log.d(TAG, "Destroying service");
         super.onDestroy();
-        // Remove any sound effects
-        final Intent audioEffectsIntent = new Intent(
-                AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
-        audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, getAudioSessionId());
-        audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName());
-        sendBroadcast(audioEffectsIntent);
+
+        // Tell any sound effect processors (e.g. equalizers) that we're leaving
+        try {
+            final Intent audioEffectsIntent = new Intent(
+                    AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
+            audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, getAudioSessionId());
+            audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName());
+            sendBroadcast(audioEffectsIntent);
+        } catch (Throwable ignored) {}
 
         // remove any pending alarms
         if (mAlarmManager != null) {