fix return from finally

Bug: 19709617.
Change-Id: I2c2e6ebe876e0e7e814554fa2ffc89551b3165b2

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} */

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;
     }
 
     /**

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;
     }
 
     /**

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;
     }
 
     /**