From 18311bd177e42e4a29ac81d4897ddfe6ded5b96c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 27 Nov 2023 12:24:11 +0000 Subject: Delete @removed-at-birth ImageDecoder APIs These APIs never shipped in a final SDK, but were marked @removed instead of actually removed (to maintain compatibility with DPs). It's been a while, so just delete them now. Removed in CLs ag/3709874, ag/3818631, ag/3780966, ag/3811428, ag/3845199 ag/3742654. Bug: 155877914 Test: m Change-Id: I874f3a9706e40bb8b8b41906eb8831c06349dcd5 --- graphics/java/android/graphics/ImageDecoder.java | 125 ----------------------- 1 file changed, 125 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index b2da233fc21e..639517996724 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java @@ -681,12 +681,6 @@ public final class ImageDecoder implements AutoCloseable { } }; - /** @removed - * @deprecated Subsumed by {@link #DecodeException}. - */ - @Deprecated - public static class IncompleteException extends IOException {}; - /** * Interface for changing the default settings of a decode. * @@ -713,24 +707,6 @@ public final class ImageDecoder implements AutoCloseable { }; - /** @removed - * @deprecated Replaced by {@link #DecodeException#SOURCE_EXCEPTION}. - */ - @Deprecated - public static final int ERROR_SOURCE_EXCEPTION = 1; - - /** @removed - * @deprecated Replaced by {@link #DecodeException#SOURCE_INCOMPLETE}. - */ - @Deprecated - public static final int ERROR_SOURCE_INCOMPLETE = 2; - - /** @removed - * @deprecated Replaced by {@link #DecodeException#SOURCE_MALFORMED_DATA}. - */ - @Deprecated - public static final int ERROR_SOURCE_ERROR = 3; - /** * Information about an interrupted decode. */ @@ -1178,14 +1154,6 @@ public final class ImageDecoder implements AutoCloseable { } // Modifiers - /** @removed - * @deprecated Renamed to {@link #setTargetSize}. - */ - @Deprecated - public ImageDecoder setResize(int width, int height) { - this.setTargetSize(width, height); - return this; - } /** * Specify the size of the output {@link Drawable} or {@link Bitmap}. @@ -1217,15 +1185,6 @@ public final class ImageDecoder implements AutoCloseable { mDesiredHeight = height; } - /** @removed - * @deprecated Renamed to {@link #setTargetSampleSize}. - */ - @Deprecated - public ImageDecoder setResize(int sampleSize) { - this.setTargetSampleSize(sampleSize); - return this; - } - private int getTargetDimension(int original, int sampleSize, int computed) { // Sampling will never result in a smaller size than 1. if (sampleSize >= original) { @@ -1381,15 +1340,6 @@ public final class ImageDecoder implements AutoCloseable { mUnpremultipliedRequired = unpremultipliedRequired; } - /** @removed - * @deprecated Renamed to {@link #setUnpremultipliedRequired}. - */ - @Deprecated - public ImageDecoder setRequireUnpremultiplied(boolean unpremultipliedRequired) { - this.setUnpremultipliedRequired(unpremultipliedRequired); - return this; - } - /** * Return whether the {@link Bitmap} will have unpremultiplied pixels. */ @@ -1397,14 +1347,6 @@ public final class ImageDecoder implements AutoCloseable { return mUnpremultipliedRequired; } - /** @removed - * @deprecated Renamed to {@link #isUnpremultipliedRequired}. - */ - @Deprecated - public boolean getRequireUnpremultiplied() { - return this.isUnpremultipliedRequired(); - } - /** * Modify the image after decoding and scaling. * @@ -1528,15 +1470,6 @@ public final class ImageDecoder implements AutoCloseable { mMutable = mutable; } - /** @removed - * @deprecated Renamed to {@link #setMutableRequired}. - */ - @Deprecated - public ImageDecoder setMutable(boolean mutable) { - this.setMutableRequired(mutable); - return this; - } - /** * Return whether the decoded {@link Bitmap} will be mutable. */ @@ -1544,14 +1477,6 @@ public final class ImageDecoder implements AutoCloseable { return mMutable; } - /** @removed - * @deprecated Renamed to {@link #isMutableRequired}. - */ - @Deprecated - public boolean getMutable() { - return this.isMutableRequired(); - } - /** * Save memory if possible by using a denser {@link Bitmap.Config} at the * cost of some image quality. @@ -1597,22 +1522,6 @@ public final class ImageDecoder implements AutoCloseable { return mConserveMemory ? MEMORY_POLICY_LOW_RAM : MEMORY_POLICY_DEFAULT; } - /** @removed - * @deprecated Replaced by {@link #setMemorySizePolicy}. - */ - @Deprecated - public void setConserveMemory(boolean conserveMemory) { - mConserveMemory = conserveMemory; - } - - /** @removed - * @deprecated Replaced by {@link #getMemorySizePolicy}. - */ - @Deprecated - public boolean getConserveMemory() { - return mConserveMemory; - } - /** * Specify whether to potentially treat the output as an alpha mask. * @@ -1632,24 +1541,6 @@ public final class ImageDecoder implements AutoCloseable { mDecodeAsAlphaMask = enabled; } - /** @removed - * @deprecated Renamed to {@link #setDecodeAsAlphaMaskEnabled}. - */ - @Deprecated - public ImageDecoder setDecodeAsAlphaMask(boolean enabled) { - this.setDecodeAsAlphaMaskEnabled(enabled); - return this; - } - - /** @removed - * @deprecated Renamed to {@link #setDecodeAsAlphaMaskEnabled}. - */ - @Deprecated - public ImageDecoder setAsAlphaMask(boolean asAlphaMask) { - this.setDecodeAsAlphaMask(asAlphaMask); - return this; - } - /** * Return whether to treat single channel input as alpha. * @@ -1662,22 +1553,6 @@ public final class ImageDecoder implements AutoCloseable { return mDecodeAsAlphaMask; } - /** @removed - * @deprecated Renamed to {@link #isDecodeAsAlphaMaskEnabled}. - */ - @Deprecated - public boolean getDecodeAsAlphaMask() { - return mDecodeAsAlphaMask; - } - - /** @removed - * @deprecated Renamed to {@link #isDecodeAsAlphaMaskEnabled}. - */ - @Deprecated - public boolean getAsAlphaMask() { - return this.getDecodeAsAlphaMask(); - } - /** * Specify the desired {@link ColorSpace} for the output. * -- cgit v1.2.3-59-g8ed1b