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

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

Browse Source 
* commit '1d2daa7809b58c226410c0060d7837de0a29888a':
  Remove FD optimization case for decodeStream
This commit is contained in:
John Reck
2013-09-10 09:29:12 -07:00
committed by Android Git Automerger
parent 488e925ff9 1d2daa7809
commit 8eb3ece8ee
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");
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];