From 5f0edaaaf55f26420345a1cd690b988f752d17c6 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Mon, 2 Nov 2020 10:29:35 +0000 Subject: Add maxTargetSdk restriction to unused APIs. These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. Bug: 170729553 Test: Treehugger Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7 Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a --- graphics/java/android/graphics/Bitmap.java | 4 ++-- graphics/java/android/graphics/BitmapFactory.java | 3 ++- graphics/java/android/graphics/Canvas.java | 4 ++-- graphics/java/android/graphics/CanvasProperty.java | 5 +++-- .../java/android/graphics/ColorMatrixColorFilter.java | 3 ++- graphics/java/android/graphics/FontListParser.java | 3 ++- graphics/java/android/graphics/GraphicBuffer.java | 5 +++-- graphics/java/android/graphics/LightingColorFilter.java | 5 +++-- graphics/java/android/graphics/LinearGradient.java | 15 ++++++++------- graphics/java/android/graphics/Movie.java | 2 +- graphics/java/android/graphics/Paint.java | 2 +- graphics/java/android/graphics/Path.java | 5 +++-- .../java/android/graphics/PorterDuffColorFilter.java | 3 ++- graphics/java/android/graphics/RadialGradient.java | 17 +++++++++-------- graphics/java/android/graphics/Region.java | 7 ++++--- graphics/java/android/graphics/SurfaceTexture.java | 11 ++++++----- graphics/java/android/graphics/SweepGradient.java | 13 +++++++------ graphics/java/android/graphics/Typeface.java | 2 +- graphics/java/android/graphics/Xfermode.java | 3 ++- .../graphics/drawable/AnimatedStateListDrawable.java | 4 ++-- .../graphics/drawable/AnimatedVectorDrawable.java | 4 ++-- .../java/android/graphics/drawable/ColorDrawable.java | 3 ++- graphics/java/android/graphics/drawable/Drawable.java | 3 ++- .../android/graphics/drawable/DrawableInflater.java | 3 ++- .../java/android/graphics/drawable/DrawableWrapper.java | 3 ++- graphics/java/android/graphics/drawable/Icon.java | 6 +++--- .../java/android/graphics/drawable/InsetDrawable.java | 3 ++- .../java/android/graphics/drawable/LayerDrawable.java | 3 ++- .../java/android/graphics/drawable/RippleDrawable.java | 7 ++++--- .../java/android/graphics/drawable/ScaleDrawable.java | 3 ++- .../android/graphics/drawable/StateListDrawable.java | 5 +++-- .../java/android/graphics/drawable/VectorDrawable.java | 3 ++- .../java/android/graphics/fonts/FontVariationAxis.java | 2 +- graphics/java/android/graphics/pdf/PdfRenderer.java | 5 +++-- 34 files changed, 97 insertions(+), 72 deletions(-) (limited to 'graphics') diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index f7877590869a..592c5ebb4d4b 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -80,7 +80,7 @@ public final class Bitmap implements Parcelable { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123769491) private byte[] mNinePatchChunk; // may be null - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private NinePatch.InsetStruct mNinePatchInsets; // may be null @UnsupportedAppUsage private int mWidth; @@ -185,7 +185,7 @@ public final class Bitmap implements Parcelable { * width/height values */ @SuppressWarnings("unused") // called from JNI - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) void reinit(int width, int height, boolean requestPremultiplied) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index bad487b47682..ef1e7bfc6651 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import android.os.Build; import android.os.Trace; import android.util.DisplayMetrics; import android.util.Log; @@ -875,7 +876,7 @@ public class BitmapFactory { @UnsupportedAppUsage private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts, long inBitmapHandle, long colorSpaceHandle); @UnsupportedAppUsage diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index d949444d44d6..9b42b5cf3158 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1397,7 +1397,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1421,7 +1421,7 @@ public class Canvas extends BaseCanvas { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index 4263772c1c2c..e949584b0659 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -17,6 +17,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import com.android.internal.util.VirtualRefBasePtr; @@ -28,12 +29,12 @@ public final class CanvasProperty { private VirtualRefBasePtr mProperty; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createFloat(float initialValue) { return new CanvasProperty(nCreateFloat(initialValue)); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static CanvasProperty createPaint(Paint initialValue) { return new CanvasProperty(nCreatePaint(initialValue.getNativeInstance())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index a8b18a9fcb1f..90ff1899f34d 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that transforms colors through a 4x5 color matrix. This filter @@ -107,7 +108,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMatrixArray(@Nullable float[] array) { // called '...Array' so that passing null isn't ambiguous discardNativeInstance(); diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index c146bbd4441b..0782f8dfd9d3 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; +import android.os.Build; import android.text.FontConfig; import android.util.Xml; @@ -38,7 +39,7 @@ import java.util.regex.Pattern; public class FontListParser { /* Parse fallback list (no names) */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static FontConfig parse(InputStream in) throws XmlPullParserException, IOException { return parse(in, "/system/fonts"); } diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index 0430847857b6..ec6b28115ac3 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -18,6 +18,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; import android.hardware.HardwareBuffer; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -55,7 +56,7 @@ public class GraphicBuffer implements Parcelable { private final int mFormat; private final int mUsage; // Note: do not rename, this field is used by native code - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final long mNativeObject; // These two fields are only used by lock/unlockCanvas() @@ -87,7 +88,7 @@ public class GraphicBuffer implements Parcelable { /** * Private use only. See {@link #create(int, int, int, int)}. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) { mWidth = width; mHeight = height; diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index 221dfa192795..df91c5d492bd 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -23,6 +23,7 @@ package android.graphics; import android.annotation.ColorInt; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to simulate simple lighting effects. @@ -73,7 +74,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorMultiply(@ColorInt int mul) { if (mMul != mul) { mMul = mul; @@ -99,7 +100,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void setColorAdd(@ColorInt int add) { if (mAdd != add) { mAdd = add; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index 3f3ad967fe97..30b518ee4248 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -21,20 +21,21 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class LinearGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY1; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. @@ -44,7 +45,7 @@ public class LinearGradient extends Shader { @UnsupportedAppUsage @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index 4b3924f0d55f..9c9535d16aab 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -28,7 +28,7 @@ import java.io.InputStream; */ @Deprecated public class Movie { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativeMovie; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 3b586242e5b1..9dd6e92a0fde 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -53,7 +53,7 @@ import java.util.Locale; */ public class Paint { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 84fe39290681..5e11074338f1 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -48,12 +49,12 @@ public class Path { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean isSimplePath = true; /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 50ecb62e7fcc..0700f217ecf0 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * A color filter that can be used to tint the source pixels using a single @@ -64,7 +65,7 @@ public class PorterDuffColorFilter extends ColorFilter { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public PorterDuff.Mode getMode() { return mMode; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index 96b7b9a78ba8..efe5e9de19b6 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -21,27 +21,28 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class RadialGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mX; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mY; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mRadius; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private TileMode mTileMode; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mCenterColor; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mEdgeColor; diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index 43373ffbd3f4..29708738d2db 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.Pools.SynchronizedPool; @@ -32,7 +33,7 @@ public class Region implements Parcelable { /** * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public long mNativeRegion; // the native values for these must match up with the enum in SkRegion.h @@ -337,7 +338,7 @@ public class Region implements Parcelable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void recycle() { setEmpty(); sPool.release(this); @@ -411,7 +412,7 @@ public class Region implements Parcelable { /* Add an unused parameter so constructor can be called from jni without triggering 'not cloneable' exception */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Region(long ni, int unused) { this(ni); } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 228d03a1dd10..7a2e5843ffc7 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -69,17 +70,17 @@ import java.lang.ref.WeakReference; */ public class SurfaceTexture { private final Looper mCreatorLooper; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Handler mOnFrameAvailableHandler; /** * These fields are used by native code, do not access or modify. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mSurfaceTexture; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mProducer; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private long mFrameAvailableListener; private boolean mIsSingleBuffered; @@ -390,7 +391,7 @@ public class SurfaceTexture { * This method is invoked from native code only. */ @SuppressWarnings({"UnusedDeclaration"}) - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void postEventFromNative(WeakReference weakSelf) { SurfaceTexture st = weakSelf.get(); if (st != null) { diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index 08520048b787..a8efc2365d04 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -21,23 +21,24 @@ import android.annotation.ColorLong; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; public class SweepGradient extends Shader { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCx; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float mCy; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private float[] mPositions; // @ColorInts are replaced by @ColorLongs, but these remain due to @UnsupportedAppUsage. - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int[] mColors; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor0; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @ColorInt private int mColor1; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index a2dd9a8322b6..bc1301a86455 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -1217,7 +1217,7 @@ public class Typeface { long native_instance, List axes); @UnsupportedAppUsage private static native long nativeCreateWeightAlias(long native_instance, int weight); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index e79fb76d806e..81769e2e21bf 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -22,6 +22,7 @@ package android.graphics; import android.compat.annotation.UnsupportedAppUsage; +import android.os.Build; /** * Xfermode is the base class for objects that are called to implement custom @@ -32,6 +33,6 @@ import android.compat.annotation.UnsupportedAppUsage; */ public class Xfermode { static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int porterDuffMode = DEFAULT; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 06159d8a0558..33a6d38b698d 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -561,9 +561,9 @@ public class AnimatedStateListDrawable extends StateListDrawable { int[] mAnimThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) LongSparseLongArray mTransitions; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) SparseIntArray mStateIds; AnimatedStateListState(@Nullable AnimatedStateListState orig, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 9fb72cf08b51..e79ada6b1c21 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -317,7 +317,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -1782,7 +1782,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } // onFinished: should be called from native - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static void callOnFinished(VectorDrawableAnimatorRT set, int id) { set.mHandler.post(() -> set.onAnimationEnd(id)); } diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index e93e7dfbe22c..8d1a98cdfe68 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.view.ViewDebug; @@ -53,7 +54,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 9cf12f121e0a..3a3da5029142 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -46,6 +46,7 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Region; import android.graphics.Xfermode; +import android.os.Build; import android.os.Trace; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -1719,7 +1720,7 @@ public abstract class Drawable { * * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static BlendMode parseBlendMode(int value, BlendMode defaultMode) { switch (value) { case 3: return BlendMode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index 3408b64e7536..66752a2536d3 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.Theme; +import android.os.Build; import android.util.AttributeSet; import android.view.InflateException; @@ -50,7 +51,7 @@ public final class DrawableInflater { new HashMap<>(); private final Resources mRes; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final ClassLoader mClassLoader; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index e197e7123fed..1054f92d2569 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -32,6 +32,7 @@ import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.Xfermode; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; @@ -47,7 +48,7 @@ import java.io.IOException; * Drawable container with only one child element. */ public abstract class DrawableWrapper extends Drawable implements Drawable.Callback { - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private DrawableWrapperState mState; private Drawable mDrawable; private boolean mMutated; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index cc7182c3fd1c..ec30a2e7d366 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -169,7 +169,7 @@ public final class Icon implements Parcelable { * @return The length of the compressed bitmap byte array held by this {@link #TYPE_DATA} Icon. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public int getDataLength() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataLength() on " + this); @@ -597,7 +597,7 @@ public final class Icon implements Parcelable { * Version of createWithResource that takes Resources. Do not use. * @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public static Icon createWithResource(Resources res, @DrawableRes int resId) { if (res == null) { throw new IllegalArgumentException("Resource must not be null."); @@ -769,7 +769,7 @@ public final class Icon implements Parcelable { } /** @hide */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public boolean hasTint() { return (mTintList != null) || (mBlendMode != DEFAULT_BLEND_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 005a4d175fd5..87c0a061c9f2 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -27,6 +27,7 @@ import android.graphics.Insets; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -58,7 +59,7 @@ public class InsetDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); private final Rect mTmpInsetRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private InsetState mState; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index fb4146f04bc9..3288bc80b5f0 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -30,6 +30,7 @@ import android.graphics.ColorFilter; import android.graphics.Outline; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.LayoutDirection; @@ -434,7 +435,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param layer The layer to add. * @return The index of the layer. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int addLayer(@NonNull ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index e5e4d4527fca..635f6c66985c 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -36,6 +36,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.util.AttributeSet; import com.android.internal.R; @@ -121,7 +122,7 @@ public class RippleDrawable extends LayerDrawable { private final Rect mDirtyBounds = new Rect(); /** Mirrors mLayerState with some extra information. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private RippleState mState; /** The masking layer, e.g. the layer with id R.id.mask. */ @@ -159,7 +160,7 @@ public class RippleDrawable extends LayerDrawable { private Paint mRipplePaint; /** Target density of the display into which ripples are drawn. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mDensity; /** Whether bounds are being overridden. */ @@ -980,7 +981,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index af7eed4b3897..7e246e552bec 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -25,6 +25,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.PixelFormat; import android.graphics.Rect; +import android.os.Build; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; @@ -67,7 +68,7 @@ public class ScaleDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private ScaleState mState; ScaleDrawable() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index 2920acbe514c..16691d4b8384 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -22,6 +22,7 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; +import android.os.Build; import android.util.AttributeSet; import android.util.StateSet; @@ -131,7 +132,7 @@ public class StateListDrawable extends DrawableContainer { /** * Updates the constant state from the values in the typed array. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void updateStateFromTypedArray(TypedArray a) { final StateListState state = mStateListState; @@ -209,7 +210,7 @@ public class StateListDrawable extends DrawableContainer { * @param attrs The attribute set. * @return An array of state_ attributes. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) int[] extractStateSet(AttributeSet attrs) { int j = 0; final int numAttrs = attrs.getAttributeCount(); diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index e6fa866df3ab..db945a110180 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -34,6 +34,7 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Rect; import android.graphics.Shader; +import android.os.Build; import android.os.Trace; import android.util.ArrayMap; import android.util.AttributeSet; @@ -324,7 +325,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private PorterDuffColorFilter mTintFilter; private BlendModeColorFilter mBlendModeColorFilter; diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 4e6580ea5f53..7bd581723d18 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -33,7 +33,7 @@ public final class FontVariationAxis { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private final int mTag; private final String mTagString; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final float mStyleValue; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 54710e58687c..720d5730b873 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -25,6 +25,7 @@ import android.graphics.Bitmap.Config; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.Rect; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.ErrnoException; import android.system.Os; @@ -121,7 +122,7 @@ public final class PdfRenderer implements AutoCloseable { private ParcelFileDescriptor mInput; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private Page mCurrentPage; /** @hide */ @@ -246,7 +247,7 @@ public final class PdfRenderer implements AutoCloseable { } } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private void doClose() { if (mCurrentPage != null) { mCurrentPage.close(); -- cgit v1.2.3