Merge "Scale up in ImageDecoder based on API level" into pi-dev am: 83ad4e53b6 (bb00d03e) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import android.database.sqlite.SQLiteDebug;
		import android.database.sqlite.SQLiteDebug.DbStats;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.ImageDecoder;
		import android.hardware.display.DisplayManagerGlobal;
		import android.net.ConnectivityManager;
		import android.net.IConnectivityManager;
		@@ -5551,6 +5552,13 @@ public final class ActivityThread extends ClientTransactionHandler {

		Message.updateCheckRecycle(data.appInfo.targetSdkVersion);

		// Prior to P, internal calls to decode Bitmaps used BitmapFactory,
		// which may scale up to account for density. In P, we switched to
		// ImageDecoder, which skips the upscale to save memory. ImageDecoder
		// needs to still scale up in older apps, in case they rely on the
		// size of the Bitmap without considering its density.
		ImageDecoder.sApiLevel = data.appInfo.targetSdkVersion;

		/*
		* Before spawning a new process, reset the time zone to be the system time zone.
		* This needs to be done because the system time zone could have changed after the

graphics/java/android/graphics/ImageDecoder.java

+14 −8

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.graphics.drawable.BitmapDrawable;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.NinePatchDrawable;
		import android.net.Uri;
		import android.os.Build;
		import android.system.ErrnoException;
		import android.system.Os;
		import android.util.DisplayMetrics;
		@@ -58,6 +59,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
		* Class for decoding images as {@link Bitmap}s or {@link Drawable}s.
		*/
		public final class ImageDecoder implements AutoCloseable {
		/ @hide /
		public static int sApiLevel;

		/**
		* Source of the encoded image data.
		*/
		@@ -1262,9 +1266,14 @@ public final class ImageDecoder implements AutoCloseable {
		return srcDensity;
		}

		// downscale the bitmap if the asset has a higher density than the default
		// For P and above, only resize if it would be a downscale. Scale up prior
		// to P in case the app relies on the Bitmap's size without considering density.
		final int dstDensity = src.computeDstDensity();
		if (srcDensity != Bitmap.DENSITY_NONE && srcDensity > dstDensity) {
		if (srcDensity == Bitmap.DENSITY_NONE \|\| srcDensity == dstDensity
		\|\| (srcDensity < dstDensity && sApiLevel >= Build.VERSION_CODES.P)) {
		return srcDensity;
		}

		float scale = (float) dstDensity / srcDensity;
		int scaledWidth = (int) (decoder.mWidth * scale + 0.5f);
		int scaledHeight = (int) (decoder.mHeight * scale + 0.5f);
		@@ -1272,9 +1281,6 @@ public final class ImageDecoder implements AutoCloseable {
		return dstDensity;
		}

		return srcDensity;
		}

		@NonNull
		private String getMimeType() {
		return nGetMimeType(mNativePtr);