Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5265d0f3 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Catch DeadObjectException in PLayerSettingsManager too 

MediaSessionCompat will crash if the player is not
responding and this will propagate to AVRCP.
We need to handle these crashes too and update the
remote device.
As all crashes should be handled the same here,
replace SecurityException by Exception.

Bug: 290576021
Tag: #feature
Test: atest net_test_btpackets
Test: atest BluetoothInstrumentationTests
Change-Id: I43a37017e9ee49e44dc6f631813ec3eb4ba96a6f
parent 3fc63129

android/app/src/com/android/bluetooth/audio_util/PlayerSettingsManager.java

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class PlayerSettingsManager { 
        MediaControllerCompat.TransportControls controls;

        try {

            controls = mActivePlayerController.getTransportControls();

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return false;

        }
@@ -155,7 +155,7 @@ public class PlayerSettingsManager { 
        MediaControllerCompat.TransportControls controls;

        try {

            controls = mActivePlayerController.getTransportControls();

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return false;

        }
@@ -186,7 +186,7 @@ public class PlayerSettingsManager { 
        int mediaFwkMode;

        try {

            mediaFwkMode = mActivePlayerController.getRepeatMode();

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return PlayerSettingsValues.STATE_REPEAT_OFF;

        }
@@ -217,7 +217,7 @@ public class PlayerSettingsManager { 
        int mediaFwkMode;

        try {

            mediaFwkMode = mActivePlayerController.getShuffleMode();

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return PlayerSettingsValues.STATE_SHUFFLE_OFF;

        }
@@ -243,7 +243,7 @@ public class PlayerSettingsManager { 
            MediaControllerCompat controller, MediaControllerCallback callback) {

        try {

            controller.registerCallback(callback);

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return false;

        }
@@ -258,7 +258,7 @@ public class PlayerSettingsManager { 
            MediaControllerCompat controller, MediaControllerCallback callback) {

        try {

            controller.unregisterCallback(callback);

        } catch (SecurityException e) {

        } catch (Exception e) {

            Log.e(TAG, e.toString());

            return false;

        }