Merge "Stop using return within finally"

2016-11-04 02:42:08 +00:00
parent 8be6cc89ef 7601049275
commit 2c442e962e
1 changed files with 5 additions and 6 deletions
--- a/core/java/android/hardware/radio/RadioMetadata.java
+++ b/core/java/android/hardware/radio/RadioMetadata.java
@@ -530,14 +530,13 @@ public final class RadioMetadata implements Parcelable {
        Bitmap bmp = null;
        try {
            bmp = BitmapFactory.decodeByteArray(value, 0, value.length);
-        } catch (Exception e) {
-        } finally {
-            if (bmp == null) {
-                return -1;
+            if (bmp != null) {
+                mBundle.putParcelable(key, bmp);
+                return 0;
            }
-            mBundle.putParcelable(key, bmp);
-            return 0;
+        } catch (Exception e) {
        }
+        return -1;
    }

    int putClockFromNative(int nativeKey, long utcEpochSeconds, int timezoneOffsetInMinutes) {