Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1c93f9 authored by Ahan Wu's avatar Ahan Wu
Browse files

Handle NPE in LocalImageResolver to avoid crashing systemui 

ContentResolver#openInputStream may return null, and may lead to
systemui keeps crashing, handle null to avoid this case.

Bug: 163412636
Test: manually
Change-Id: Ie149b75d4445b37afac82c8351a32cb17442936d
parent 96bcb1b2

core/java/com/android/internal/widget/LocalImageResolver.java

+13 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.BitmapFactory; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.util.Log;



import java.io.IOException;

import java.io.InputStream;
@@ -31,6 +32,7 @@ import java.io.InputStream; 
 * A class to extract Bitmaps from a MessagingStyle message.

 */

public class LocalImageResolver {

    private static final String TAG = LocalImageResolver.class.getSimpleName();



    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)

            throws IOException {

        InputStream input = context.getContentResolver().openInputStream(uri);

        BitmapFactory.Options onlyBoundsOptions = new BitmapFactory.Options();

        try (InputStream input = context.getContentResolver().openInputStream(uri)) {

            if (input == null) {

                throw new IllegalArgumentException();

            }

            onlyBoundsOptions.inJustDecodeBounds = true;

            BitmapFactory.decodeStream(input, null, onlyBoundsOptions);

        input.close();

        } catch (IllegalArgumentException iae) {

            onlyBoundsOptions.outWidth = -1;

            onlyBoundsOptions.outHeight = -1;

            Log.e(TAG, "error loading image", iae);

        }

        return onlyBoundsOptions;

    }