From b304ba5bc8fbc6034cf232cbbeeb3a34a5ce5b9f Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Wed, 18 Mar 2015 09:52:05 -0700
Subject: [PATCH] fix return from finally

Bug: 19709617.
Change-Id: I2c2e6ebe876e0e7e814554fa2ffc89551b3165b2
---
 media/java/android/media/AudioManager.java                 | 3 +--
 media/java/android/media/audiofx/AcousticEchoCanceler.java | 3 +--
 media/java/android/media/audiofx/AutomaticGainControl.java | 3 +--
 media/java/android/media/audiofx/NoiseSuppressor.java      | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 8c1ba05c78486..5200454a5071c 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -3084,9 +3084,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} */
diff --git a/media/java/android/media/audiofx/AcousticEchoCanceler.java b/media/java/android/media/audiofx/AcousticEchoCanceler.java
index 4b59c88acbc84..f5f98efeb94f7 100644
--- a/media/java/android/media/audiofx/AcousticEchoCanceler.java
+++ b/media/java/android/media/audiofx/AcousticEchoCanceler.java
@@ -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;
     }
 
     /**
diff --git a/media/java/android/media/audiofx/AutomaticGainControl.java b/media/java/android/media/audiofx/AutomaticGainControl.java
index 83eb4e9f55683..4a6b1f307f9c5 100644
--- a/media/java/android/media/audiofx/AutomaticGainControl.java
+++ b/media/java/android/media/audiofx/AutomaticGainControl.java
@@ -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;
     }
 
     /**
diff --git a/media/java/android/media/audiofx/NoiseSuppressor.java b/media/java/android/media/audiofx/NoiseSuppressor.java
index 0ea42ab67d5d0..bca990f1c9765 100644
--- a/media/java/android/media/audiofx/NoiseSuppressor.java
+++ b/media/java/android/media/audiofx/NoiseSuppressor.java
@@ -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;
     }
 
     /**