Do not openInputStream twice without closing
am: 25dcb3a1b1
Change-Id: Iaf9d2921f92338bce61afbbd0e6849136f403d86
diff --git a/src/com/android/wallpaper/asset/StreamableAsset.java b/src/com/android/wallpaper/asset/StreamableAsset.java
index 118581d..17f2522 100755
--- a/src/com/android/wallpaper/asset/StreamableAsset.java
+++ b/src/com/android/wallpaper/asset/StreamableAsset.java
@@ -260,12 +260,6 @@
mTargetWidth = tempHeight;
}
- InputStream inputStream = openInputStream();
- // Input stream may be null if there was an error opening it.
- if (inputStream == null) {
- return null;
- }
-
BitmapFactory.Options options = new BitmapFactory.Options();
Point rawDimensions = calculateRawDimensions();
@@ -277,6 +271,7 @@
rawDimensions.x, rawDimensions.y, mTargetWidth, mTargetHeight);
options.inPreferredConfig = Config.HARDWARE;
+ InputStream inputStream = openInputStream();
Bitmap bitmap = BitmapFactory.decodeStream(inputStream, null, options);
closeInputStream(
inputStream, "Error closing the input stream used to decode the full bitmap");