Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove FD optimization case for decodeStream" into klp-dev

Browse Source
This commit is contained in:
John Reck
2013-09-10 16:25:14 +00:00
committed by Android (Google) Code Review
parent 8716c08151 5835157d76
commit 1d2daa7809
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/java/android/graphics/BitmapFactory.java
View File

@@ -565,24 +565,10 @@ public class BitmapFactory {
Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "decodeBitmap"); Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "decodeBitmap");
try { try {
boolean decodeGenericStream = true;
if (is instanceof AssetManager.AssetInputStream) { if (is instanceof AssetManager.AssetInputStream) {
final int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); final int asset = ((AssetManager.AssetInputStream) is).getAssetInt();
bm = nativeDecodeAsset(asset, outPadding, opts); bm = nativeDecodeAsset(asset, outPadding, opts);
// Do not follow the normal case. } else {
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) {
byte [] tempStorage = null; byte [] tempStorage = null;
if (opts != null) tempStorage = opts.inTempStorage; if (opts != null) tempStorage = opts.inTempStorage;
if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE]; if (tempStorage == null) tempStorage = new byte[DECODE_BUFFER_SIZE];