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

Commit fedd53b8 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Don't try to rescale when no bitmap in RemoteControlClient"

parents 31c272ae 6e679d5a

media/java/android/media/RemoteControlClient.java

+16 −14
Original line number Diff line number Diff line
@@ -722,6 +722,7 @@ public class RemoteControlClient 
     */



    private Bitmap scaleBitmapIfTooBig(Bitmap bitmap, int maxWidth, int maxHeight) {

        if (bitmap != null) {

            final int width = bitmap.getWidth();

            final int height = bitmap.getHeight();

            if (width > maxWidth || height > maxHeight) {
@@ -737,6 +738,7 @@ public class RemoteControlClient 
                        new RectF(0, 0, outBitmap.getWidth(), outBitmap.getHeight()), paint);

                bitmap = outBitmap;

            }

        }

        return bitmap;



    }