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

Commit 6bb720ae authored by Jay Shrauner's avatar Jay Shrauner Committed by Natiq Ahmed
Browse files

Fix NPE in decodedBitmapDrawable 

Check for whether bitmap was successfully decoded from byte array.

Bug:18508529

Change-Id: If5c1bb3f0b726be5891d5b33d8bc7073cf40b108
parent 2efbfa3c

src/com/android/contacts/util/ImageViewDrawableSetter.java

+10 −3
Original line number Diff line number Diff line
@@ -108,9 +108,10 @@ public class ImageViewDrawableSetter { 
            return previousBitmap();

        }



        final Drawable newDrawable = (compressed == null)

                ? defaultDrawable(c,account)

                : decodedBitmapDrawable(compressed);

        Drawable newDrawable = decodedBitmapDrawable(compressed);

        if (newDrawable == null) {

            newDrawable = defaultDrawable(c,account);

        }



        // Remember this for next time, so that we can check if it changed.

        mCompressed = compressed;
@@ -171,8 +172,14 @@ public class ImageViewDrawableSetter { 
    }



    private BitmapDrawable decodedBitmapDrawable(byte[] compressed) {

        if (compressed == null) {

            return null;

        }

        final Resources rsrc = mTarget.getResources();

        Bitmap bitmap = BitmapFactory.decodeByteArray(compressed, 0, compressed.length);

        if (bitmap == null) {

            return null;

        }

        if (bitmap.getHeight() != bitmap.getWidth()) {

            // Crop the bitmap into a square.

            final int size = Math.min(bitmap.getWidth(), bitmap.getHeight());