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

Commit f6cc4fa7 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Catch DeadObjectException in PLayerSettingsManager too" into main am:... 

Merge "Catch DeadObjectException in PLayerSettingsManager too" into main am: 5d0827f4 am: 27ab29b9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2776875



Change-Id: I882008cbfede4948d28426aaeb53f38dda143b0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9507a01 27ab29b9

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

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

        MediaControllerCompat.TransportControls controls;

        try {

        try {

            controls = mActivePlayerController.getTransportControls();

            controls = mActivePlayerController.getTransportControls();

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return false;

            return false;

        }

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

        MediaControllerCompat.TransportControls controls;

        try {

        try {

            controls = mActivePlayerController.getTransportControls();

            controls = mActivePlayerController.getTransportControls();

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return false;

            return false;

        }

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

        int mediaFwkMode;

        try {

        try {

            mediaFwkMode = mActivePlayerController.getRepeatMode();

            mediaFwkMode = mActivePlayerController.getRepeatMode();

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return PlayerSettingsValues.STATE_REPEAT_OFF;

            return PlayerSettingsValues.STATE_REPEAT_OFF;

        }

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

        int mediaFwkMode;

        try {

        try {

            mediaFwkMode = mActivePlayerController.getShuffleMode();

            mediaFwkMode = mActivePlayerController.getShuffleMode();

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return PlayerSettingsValues.STATE_SHUFFLE_OFF;

            return PlayerSettingsValues.STATE_SHUFFLE_OFF;

        }

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

            MediaControllerCompat controller, MediaControllerCallback callback) {

        try {

        try {

            controller.registerCallback(callback);

            controller.registerCallback(callback);

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return false;

            return false;

        }

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

            MediaControllerCompat controller, MediaControllerCallback callback) {

        try {

        try {

            controller.unregisterCallback(callback);

            controller.unregisterCallback(callback);

        } catch (SecurityException e) {

        } catch (Exception e) {

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

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

            return false;

            return false;

        }

        }