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

Commit f09d4bd3 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "fix return from finally"

parents ac9e2d75 b304ba5b

media/java/android/media/AudioManager.java

+1 −2
Original line number Diff line number Diff line
@@ -3091,9 +3091,8 @@ public class AudioManager { 
            delay = service.setBluetoothA2dpDeviceConnectionState(device, state, profile);

        } catch (RemoteException e) {

            Log.e(TAG, "Dead object in setBluetoothA2dpDeviceConnectionState "+e);

        } finally {

            return delay;

        }

        return delay;

    }



    /** {@hide} */

media/java/android/media/audiofx/AcousticEchoCanceler.java

+1 −2
Original line number Diff line number Diff line
@@ -68,9 +68,8 @@ public class AcousticEchoCanceler extends AudioEffect { 
            Log.w(TAG, "not enough resources");

        } catch (RuntimeException e) {

            Log.w(TAG, "not enough memory");

        } finally {

            return aec;

        }

        return aec;

    }



    /**

media/java/android/media/audiofx/AutomaticGainControl.java

+1 −2
Original line number Diff line number Diff line
@@ -68,9 +68,8 @@ public class AutomaticGainControl extends AudioEffect { 
            Log.w(TAG, "not enough resources");

        } catch (RuntimeException e) {

            Log.w(TAG, "not enough memory");

        } finally {

            return agc;

        }

        return agc;

    }



    /**

media/java/android/media/audiofx/NoiseSuppressor.java

+1 −2
Original line number Diff line number Diff line
@@ -70,9 +70,8 @@ public class NoiseSuppressor extends AudioEffect { 
            Log.w(TAG, "not enough resources");

        } catch (RuntimeException e) {

            Log.w(TAG, "not enough memory");

        } finally {

            return ns;

        }

        return ns;

    }



    /**