am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev

* commit '8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc':
  Remove FD optimization case for decodeStream

1 files changed, 1 insertions, 15 deletions

diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 25e8567..41ec79a 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -570,24 +570,10 @@ public class BitmapFactory {
 
         Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "decodeBitmap");
         try {
-            boolean decodeGenericStream = true;
             if (is instanceof AssetManager.AssetInputStream) {
                 final int asset = ((AssetManager.AssetInputStream) is).getAssetInt();
                 bm = nativeDecodeAsset(asset, outPadding, opts);
-                // Do not follow the normal case.
-                decodeGenericStream = false;
-            } else if (is instanceof FileInputStream) {
-                try {
-                    FileDescriptor fd = ((FileInputStream) is).getFD();
-                    // decodeFileDescriptor will take care of throwing the IAE and
-                    // calling setDensityFromOptions.
-                    return decodeFileDescriptor(fd, outPadding, opts);
-                } catch (IOException e) {
-                    // Fall through to nativeDecodeStream.
-                }
-            }
-
-            if (decodeGenericStream) {
+            } else {
                 byte [] tempStorage = null;
                 if (opts != null) tempStorage = opts.inTempStorage;
                 if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE];