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

Merge "Handle NPE in LocalImageResolver to avoid crashing systemui" into rvc-qpr-dev am: 6bf25fdfc4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12421224

Change-Id: Ia1613a1a7e5524112b8221fbc608270d4dd87664
This commit is contained in:
TreeHugger Robot
2020-08-24 03:55:46 +00:00
committed by Automerger Merge Worker
parent 540ff060c8 6bf25fdfc4
commit 8517455df4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/com/android/internal/widget/LocalImageResolver.java
View File

@@ -23,6 +23,7 @@ import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@@ -31,6 +32,7 @@ import java.io.InputStream;
* A class to extract Bitmaps from a MessagingStyle message. * A class to extract Bitmaps from a MessagingStyle message.
*/ */
public class LocalImageResolver { public class LocalImageResolver {
private static final String TAG = LocalImageResolver.class.getSimpleName();
private static final int MAX_SAFE_ICON_SIZE_PX = 480; private static final int MAX_SAFE_ICON_SIZE_PX = 480;
@@ -60,11 +62,18 @@ public class LocalImageResolver {
private static BitmapFactory.Options getBoundsOptionsForImage(Uri uri, Context context) private static BitmapFactory.Options getBoundsOptionsForImage(Uri uri, Context context)
throws IOException { throws IOException {
InputStream input = context.getContentResolver().openInputStream(uri);
BitmapFactory.Options onlyBoundsOptions = new BitmapFactory.Options(); BitmapFactory.Options onlyBoundsOptions = new BitmapFactory.Options();
onlyBoundsOptions.inJustDecodeBounds = true; try (InputStream input = context.getContentResolver().openInputStream(uri)) {
BitmapFactory.decodeStream(input, null, onlyBoundsOptions); if (input == null) {
input.close(); throw new IllegalArgumentException();
}
onlyBoundsOptions.inJustDecodeBounds = true;
BitmapFactory.decodeStream(input, null, onlyBoundsOptions);
} catch (IllegalArgumentException iae) {
onlyBoundsOptions.outWidth = -1;
onlyBoundsOptions.outHeight = -1;
Log.e(TAG, "error loading image", iae);
}
return onlyBoundsOptions; return onlyBoundsOptions;
} }