Merge "Remove needlessly thrown IOException." into lmp-dev (f305d2c4) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@ public final class Bitmap_Delegate {
		* Creates and returns a {@link Bitmap} initialized with the given stream content.
		*
		* @param input the stream from which to read the bitmap content
		* @param createFlags
		* @param density the density associated with the bitmap
		*
		* @see Bitmap#isPremultiplied()
		@@ -166,8 +165,7 @@ public final class Bitmap_Delegate {
		* @see Bitmap#isMutable()
		* @see Bitmap#getDensity()
		*/
		public static Bitmap createBitmap(BufferedImage image, boolean isMutable,
		Density density) throws IOException {
		public static Bitmap createBitmap(BufferedImage image, boolean isMutable, Density density) {
		return createBitmap(image, getPremultipliedBitmapCreateFlags(isMutable), density);
		}

		@@ -175,7 +173,6 @@ public final class Bitmap_Delegate {
		* Creates and returns a {@link Bitmap} initialized with the given {@link BufferedImage}
		*
		* @param image the bitmap content
		* @param createFlags
		* @param density the density associated with the bitmap
		*
		* @see Bitmap#isPremultiplied()
		@@ -183,7 +180,7 @@ public final class Bitmap_Delegate {
		* @see Bitmap#getDensity()
		*/
		public static Bitmap createBitmap(BufferedImage image, Set<BitmapCreateFlags> createFlags,
		Density density) throws IOException {
		Density density) {
		// create a delegate with the given image.
		Bitmap_Delegate delegate = new Bitmap_Delegate(image, Config.ARGB_8888);

+41 −45

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ public class RenderDrawable extends RenderAction<DrawableParams> {

		public Result render() {
		checkLock();
		try {
		// get the drawable resource value
		DrawableParams params = getParams();
		HardwareConfig hardwareConfig = params.getHardwareConfig();
		@@ -111,9 +110,6 @@ public class RenderDrawable extends RenderAction<DrawableParams> {
		content.draw(canvas);

		return Status.SUCCESS.createResult(image);
		} catch (IOException e) {
		return ERROR_UNKNOWN.createResult(e.getMessage(), e);
		}
		}

		protected BufferedImage getImage(int w, int h) {