Merge "Add @UnsupportedAppUsage annotations" (95f8ca9f) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −218

Original line number	Original line	Diff line number	Diff line
	@@ -2016,224 +2016,6 @@ Landroid/filterfw/geometry/Quad;->p3:Landroid/filterfw/geometry/Point;
	Landroid/filterfw/GraphEnvironment;-><init>()V		Landroid/filterfw/GraphEnvironment;-><init>()V
	Landroid/filterfw/GraphEnvironment;->getRunner(II)Landroid/filterfw/core/GraphRunner;		Landroid/filterfw/GraphEnvironment;->getRunner(II)Landroid/filterfw/core/GraphRunner;
	Landroid/filterfw/GraphEnvironment;->loadGraph(Landroid/content/Context;I)I		Landroid/filterfw/GraphEnvironment;->loadGraph(Landroid/content/Context;I)I
	Landroid/graphics/BaseCanvas;->mNativeCanvasWrapper:J
	Landroid/graphics/Bitmap$Config;->nativeInt:I
	Landroid/graphics/Bitmap$Config;->nativeToConfig(I)Landroid/graphics/Bitmap$Config;
	Landroid/graphics/Bitmap;->createAshmemBitmap()Landroid/graphics/Bitmap;
	Landroid/graphics/Bitmap;->createAshmemBitmap(Landroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
	Landroid/graphics/Bitmap;->getDefaultDensity()I
	Landroid/graphics/Bitmap;->mHeight:I
	Landroid/graphics/Bitmap;->mNativePtr:J
	Landroid/graphics/Bitmap;->mNinePatchChunk:[B
	Landroid/graphics/Bitmap;->mNinePatchInsets:Landroid/graphics/NinePatch$InsetStruct;
	Landroid/graphics/Bitmap;->mWidth:I
	Landroid/graphics/Bitmap;->nativeReconfigure(JIIIZ)V
	Landroid/graphics/Bitmap;->reinit(IIZ)V
	Landroid/graphics/Bitmap;->scaleFromDensity(III)I
	Landroid/graphics/Bitmap;->setDefaultDensity(I)V
	Landroid/graphics/Bitmap;->setNinePatchChunk([B)V
	Landroid/graphics/BitmapFactory;->nativeDecodeAsset(JLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
	Landroid/graphics/BitmapFactory;->nativeDecodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
	Landroid/graphics/BitmapFactory;->nativeDecodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
	Landroid/graphics/BitmapFactory;->nativeDecodeStream(Ljava/io/InputStream;[BLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap;
	Landroid/graphics/BitmapRegionDecoder;-><init>(J)V
	Landroid/graphics/BitmapRegionDecoder;->nativeNewInstance([BIIZ)Landroid/graphics/BitmapRegionDecoder;
	Landroid/graphics/BitmapShader;->mBitmap:Landroid/graphics/Bitmap;
	Landroid/graphics/BitmapShader;->mTileX:I
	Landroid/graphics/BitmapShader;->mTileY:I
	Landroid/graphics/Camera;->native_instance:J
	Landroid/graphics/Canvas;-><init>(J)V
	Landroid/graphics/Canvas;->freeCaches()V
	Landroid/graphics/Canvas;->freeTextLayoutCaches()V
	Landroid/graphics/Canvas;->getGL()Ljavax/microedition/khronos/opengles/GL;
	Landroid/graphics/Canvas;->getNativeCanvasWrapper()J
	Landroid/graphics/Canvas;->mBitmap:Landroid/graphics/Bitmap;
	Landroid/graphics/Canvas;->release()V
	Landroid/graphics/Canvas;->setScreenDensity(I)V
	Landroid/graphics/CanvasProperty;->createFloat(F)Landroid/graphics/CanvasProperty;
	Landroid/graphics/CanvasProperty;->createPaint(Landroid/graphics/Paint;)Landroid/graphics/CanvasProperty;
	Landroid/graphics/ColorMatrixColorFilter;->mMatrix:Landroid/graphics/ColorMatrix;
	Landroid/graphics/ColorMatrixColorFilter;->setColorMatrix(Landroid/graphics/ColorMatrix;)V
	Landroid/graphics/drawable/AnimatedRotateDrawable;->setFramesCount(I)V
	Landroid/graphics/drawable/AnimatedRotateDrawable;->setFramesDuration(I)V
	Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mStateIds:Landroid/util/SparseIntArray;
	Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mTransitions:Landroid/util/LongSparseLongArray;
	Landroid/graphics/drawable/AnimatedStateListDrawable;->mState:Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;
	Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;->callOnFinished(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V
	Landroid/graphics/drawable/AnimatedVectorDrawable;->forceAnimationOnUI()V
	Landroid/graphics/drawable/AnimatedVectorDrawable;->mAnimatedVectorState:Landroid/graphics/drawable/AnimatedVectorDrawable$AnimatedVectorDrawableState;
	Landroid/graphics/drawable/AnimatedVectorDrawable;->mAnimatorSet:Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimator;
	Landroid/graphics/drawable/AnimationDrawable;->mCurFrame:I
	Landroid/graphics/drawable/BitmapDrawable;->getTint()Landroid/content/res/ColorStateList;
	Landroid/graphics/drawable/BitmapDrawable;->getTintMode()Landroid/graphics/PorterDuff$Mode;
	Landroid/graphics/drawable/BitmapDrawable;->mBitmapState:Landroid/graphics/drawable/BitmapDrawable$BitmapState;
	Landroid/graphics/drawable/BitmapDrawable;->mTargetDensity:I
	Landroid/graphics/drawable/BitmapDrawable;->setBitmap(Landroid/graphics/Bitmap;)V
	Landroid/graphics/drawable/ClipDrawable;->mState:Landroid/graphics/drawable/ClipDrawable$ClipState;
	Landroid/graphics/drawable/ColorDrawable$ColorState;->mUseColor:I
	Landroid/graphics/drawable/ColorDrawable;->mPaint:Landroid/graphics/Paint;
	Landroid/graphics/drawable/Drawable;->inflateWithAttributes(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/TypedArray;I)V
	Landroid/graphics/drawable/Drawable;->mCallback:Ljava/lang/ref/WeakReference;
	Landroid/graphics/drawable/Drawable;->mSrcDensityOverride:I
	Landroid/graphics/drawable/Drawable;->parseTintMode(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode;
	Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;-><init>(Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;Landroid/graphics/drawable/DrawableContainer;Landroid/content/res/Resources;)V
	Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect;
	Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawables:[Landroid/graphics/drawable/Drawable;
	Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z
	Landroid/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;
	Landroid/graphics/drawable/DrawableContainer;->mLastDrawable:Landroid/graphics/drawable/Drawable;
	Landroid/graphics/drawable/DrawableInflater;->mClassLoader:Ljava/lang/ClassLoader;
	Landroid/graphics/drawable/DrawableWrapper;->mState:Landroid/graphics/drawable/DrawableWrapper$DrawableWrapperState;
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mAngle:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradient:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradientColors:[I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mHeight:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadius:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadiusRatio:F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mOrientation:Landroid/graphics/drawable/GradientDrawable$Orientation;
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mPadding:Landroid/graphics/Rect;
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mPositions:[F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadius:F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadiusArray:[F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mShape:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mSolidColors:Landroid/content/res/ColorStateList;
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashGap:F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashWidth:F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeWidth:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mThickness:I
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mThicknessRatio:F
	Landroid/graphics/drawable/GradientDrawable$GradientState;->mWidth:I
	Landroid/graphics/drawable/GradientDrawable;->mFillPaint:Landroid/graphics/Paint;
	Landroid/graphics/drawable/GradientDrawable;->mGradientState:Landroid/graphics/drawable/GradientDrawable$GradientState;
	Landroid/graphics/drawable/GradientDrawable;->mPadding:Landroid/graphics/Rect;
	Landroid/graphics/drawable/GradientDrawable;->mStrokePaint:Landroid/graphics/Paint;
	Landroid/graphics/drawable/Icon;->createWithResource(Landroid/content/res/Resources;I)Landroid/graphics/drawable/Icon;
	Landroid/graphics/drawable/Icon;->getBitmap()Landroid/graphics/Bitmap;
	Landroid/graphics/drawable/Icon;->getDataBytes()[B
	Landroid/graphics/drawable/Icon;->getDataLength()I
	Landroid/graphics/drawable/Icon;->getDataOffset()I
	Landroid/graphics/drawable/Icon;->getResources()Landroid/content/res/Resources;
	Landroid/graphics/drawable/Icon;->hasTint()Z
	Landroid/graphics/drawable/Icon;->mString1:Ljava/lang/String;
	Landroid/graphics/drawable/Icon;->mType:I
	Landroid/graphics/drawable/InsetDrawable;->mState:Landroid/graphics/drawable/InsetDrawable$InsetState;
	Landroid/graphics/drawable/LayerDrawable$ChildDrawable;->mDrawable:Landroid/graphics/drawable/Drawable;
	Landroid/graphics/drawable/LayerDrawable$LayerState;->mChildren:[Landroid/graphics/drawable/LayerDrawable$ChildDrawable;
	Landroid/graphics/drawable/LayerDrawable;->addLayer(Landroid/graphics/drawable/LayerDrawable$ChildDrawable;)I
	Landroid/graphics/drawable/LayerDrawable;->ensurePadding()V
	Landroid/graphics/drawable/LayerDrawable;->mLayerState:Landroid/graphics/drawable/LayerDrawable$LayerState;
	Landroid/graphics/drawable/NinePatchDrawable$NinePatchState;->mNinePatch:Landroid/graphics/NinePatch;
	Landroid/graphics/drawable/NinePatchDrawable;->mNinePatchState:Landroid/graphics/drawable/NinePatchDrawable$NinePatchState;
	Landroid/graphics/drawable/RippleDrawable$RippleState;->mColor:Landroid/content/res/ColorStateList;
	Landroid/graphics/drawable/RippleDrawable;->getRipplePaint()Landroid/graphics/Paint;
	Landroid/graphics/drawable/RippleDrawable;->mDensity:I
	Landroid/graphics/drawable/RippleDrawable;->mState:Landroid/graphics/drawable/RippleDrawable$RippleState;
	Landroid/graphics/drawable/RippleDrawable;->setForceSoftware(Z)V
	Landroid/graphics/drawable/RotateDrawable;->mState:Landroid/graphics/drawable/RotateDrawable$RotateState;
	Landroid/graphics/drawable/ScaleDrawable;->mState:Landroid/graphics/drawable/ScaleDrawable$ScaleState;
	Landroid/graphics/drawable/StateListDrawable$StateListState;->addStateSet([ILandroid/graphics/drawable/Drawable;)I
	Landroid/graphics/drawable/StateListDrawable;->extractStateSet(Landroid/util/AttributeSet;)[I
	Landroid/graphics/drawable/StateListDrawable;->mStateListState:Landroid/graphics/drawable/StateListDrawable$StateListState;
	Landroid/graphics/drawable/StateListDrawable;->updateStateFromTypedArray(Landroid/content/res/TypedArray;)V
	Landroid/graphics/drawable/TransitionDrawable;->mAlpha:I
	Landroid/graphics/drawable/TransitionDrawable;->mCrossFade:Z
	Landroid/graphics/drawable/TransitionDrawable;->mTo:I
	Landroid/graphics/drawable/VectorDrawable$VGroup;->setPivotX(F)V
	Landroid/graphics/drawable/VectorDrawable$VGroup;->setPivotY(F)V
	Landroid/graphics/drawable/VectorDrawable$VGroup;->setRotation(F)V
	Landroid/graphics/drawable/VectorDrawable$VGroup;->setTranslateX(F)V
	Landroid/graphics/drawable/VectorDrawable$VGroup;->setTranslateY(F)V
	Landroid/graphics/drawable/VectorDrawable;->getTargetByName(Ljava/lang/String;)Ljava/lang/Object;
	Landroid/graphics/drawable/VectorDrawable;->mTintFilter:Landroid/graphics/PorterDuffColorFilter;
	Landroid/graphics/drawable/VectorDrawable;->setAllowCaching(Z)V
	Landroid/graphics/FontFamily;-><init>()V
	Landroid/graphics/FontFamily;->abortCreation()V
	Landroid/graphics/FontFamily;->addFontFromAssetManager(Landroid/content/res/AssetManager;Ljava/lang/String;IZIII[Landroid/graphics/fonts/FontVariationAxis;)Z
	Landroid/graphics/FontFamily;->addFontFromBuffer(Ljava/nio/ByteBuffer;I[Landroid/graphics/fonts/FontVariationAxis;II)Z
	Landroid/graphics/FontFamily;->freeze()Z
	Landroid/graphics/fonts/FontVariationAxis;->mStyleValue:F
	Landroid/graphics/fonts/FontVariationAxis;->mTag:I
	Landroid/graphics/GraphicBuffer;-><init>(IIIIJ)V
	Landroid/graphics/GraphicBuffer;->createFromExisting(IIIIJ)Landroid/graphics/GraphicBuffer;
	Landroid/graphics/GraphicBuffer;->CREATOR:Landroid/os/Parcelable$Creator;
	Landroid/graphics/GraphicBuffer;->mNativeObject:J
	Landroid/graphics/ImageFormat;->Y8:I
	Landroid/graphics/LightingColorFilter;->setColorAdd(I)V
	Landroid/graphics/LightingColorFilter;->setColorMultiply(I)V
	Landroid/graphics/LinearGradient;->mColor0:I
	Landroid/graphics/LinearGradient;->mColor1:I
	Landroid/graphics/LinearGradient;->mColors:[I
	Landroid/graphics/LinearGradient;->mPositions:[F
	Landroid/graphics/LinearGradient;->mTileMode:Landroid/graphics/Shader$TileMode;
	Landroid/graphics/LinearGradient;->mX0:F
	Landroid/graphics/LinearGradient;->mX1:F
	Landroid/graphics/LinearGradient;->mY0:F
	Landroid/graphics/LinearGradient;->mY1:F
	Landroid/graphics/Matrix;->IDENTITY_MATRIX:Landroid/graphics/Matrix;
	Landroid/graphics/Matrix;->native_instance:J
	Landroid/graphics/Movie;-><init>(J)V
	Landroid/graphics/Movie;->mNativeMovie:J
	Landroid/graphics/NinePatch$InsetStruct;-><init>(IIIIIIIIFIF)V
	Landroid/graphics/NinePatch;->mBitmap:Landroid/graphics/Bitmap;
	Landroid/graphics/NinePatch;->mNativeChunk:J
	Landroid/graphics/Outline;->mRect:Landroid/graphics/Rect;
	Landroid/graphics/Paint;->getNativeInstance()J
	Landroid/graphics/Paint;->getTextRunAdvances([CIIIIZ[FI)F
	Landroid/graphics/Paint;->getTextRunCursor([CIIIII)I
	Landroid/graphics/Paint;->mNativePaint:J
	Landroid/graphics/Paint;->mTypeface:Landroid/graphics/Typeface;
	Landroid/graphics/Paint;->setCompatibilityScaling(F)V
	Landroid/graphics/Paint;->setHyphenEdit(I)V
	Landroid/graphics/Path;->isSimplePath:Z
	Landroid/graphics/Path;->rects:Landroid/graphics/Region;
	Landroid/graphics/pdf/PdfRenderer;->doClose()V
	Landroid/graphics/pdf/PdfRenderer;->mCurrentPage:Landroid/graphics/pdf/PdfRenderer$Page;
	Landroid/graphics/Picture;->mNativePicture:J
	Landroid/graphics/PorterDuff$Mode;->nativeInt:I
	Landroid/graphics/PorterDuffColorFilter;->getColor()I
	Landroid/graphics/PorterDuffColorFilter;->getMode()Landroid/graphics/PorterDuff$Mode;
	Landroid/graphics/RadialGradient;->mCenterColor:I
	Landroid/graphics/RadialGradient;->mColors:[I
	Landroid/graphics/RadialGradient;->mEdgeColor:I
	Landroid/graphics/RadialGradient;->mPositions:[F
	Landroid/graphics/RadialGradient;->mRadius:F
	Landroid/graphics/RadialGradient;->mTileMode:Landroid/graphics/Shader$TileMode;
	Landroid/graphics/RadialGradient;->mX:F
	Landroid/graphics/RadialGradient;->mY:F
	Landroid/graphics/Rect;->printShortString(Ljava/io/PrintWriter;)V
	Landroid/graphics/Rect;->scale(F)V
	Landroid/graphics/Region$Op;->nativeInt:I
	Landroid/graphics/Region;-><init>(JI)V
	Landroid/graphics/Region;->mNativeRegion:J
	Landroid/graphics/Region;->recycle()V
	Landroid/graphics/Region;->scale(F)V
	Landroid/graphics/Shader$TileMode;->nativeInt:I
	Landroid/graphics/SurfaceTexture;->mFrameAvailableListener:J
	Landroid/graphics/SurfaceTexture;->mOnFrameAvailableHandler:Landroid/os/Handler;
	Landroid/graphics/SurfaceTexture;->mProducer:J
	Landroid/graphics/SurfaceTexture;->mSurfaceTexture:J
	Landroid/graphics/SurfaceTexture;->nativeDetachFromGLContext()I
	Landroid/graphics/SurfaceTexture;->postEventFromNative(Ljava/lang/ref/WeakReference;)V
	Landroid/graphics/SweepGradient;->mColor0:I
	Landroid/graphics/SweepGradient;->mColor1:I
	Landroid/graphics/SweepGradient;->mColors:[I
	Landroid/graphics/SweepGradient;->mCx:F
	Landroid/graphics/SweepGradient;->mCy:F
	Landroid/graphics/SweepGradient;->mPositions:[F
	Landroid/graphics/TableMaskFilter;->CreateClipTable(II)Landroid/graphics/TableMaskFilter;
	Landroid/graphics/TemporaryBuffer;->obtain(I)[C
	Landroid/graphics/TemporaryBuffer;->recycle([C)V
	Landroid/graphics/Typeface;-><init>(J)V
	Landroid/graphics/Typeface;->createFromFamilies([Landroid/graphics/FontFamily;)Landroid/graphics/Typeface;
	Landroid/graphics/Typeface;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;II)Landroid/graphics/Typeface;
	Landroid/graphics/Typeface;->mStyle:I
	Landroid/graphics/Typeface;->nativeCreateFromArray([JII)J
	Landroid/graphics/Typeface;->nativeCreateWeightAlias(JI)J
	Landroid/graphics/Typeface;->native_instance:J
	Landroid/graphics/Typeface;->sDefaults:[Landroid/graphics/Typeface;
	Landroid/graphics/Typeface;->setDefault(Landroid/graphics/Typeface;)V
	Landroid/graphics/Typeface;->sSystemFontMap:Ljava/util/Map;
	Landroid/graphics/Xfermode;->porterDuffMode:I
	Landroid/hardware/Camera$Parameters;->copyFrom(Landroid/hardware/Camera$Parameters;)V		Landroid/hardware/Camera$Parameters;->copyFrom(Landroid/hardware/Camera$Parameters;)V
	Landroid/hardware/Camera$Parameters;->dump()V		Landroid/hardware/Camera$Parameters;->dump()V
	Landroid/hardware/Camera$Parameters;->splitArea(Ljava/lang/String;)Ljava/util/ArrayList;		Landroid/hardware/Camera$Parameters;->splitArea(Ljava/lang/String;)Ljava/util/ArrayList;

config/hiddenapi-vendor-list.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -86,10 +86,6 @@ Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landro
	Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V		Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V
	Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;		Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;
	Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;		Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
	Landroid/graphics/Bitmap;->createGraphicBufferHandle()Landroid/graphics/GraphicBuffer;
	Landroid/graphics/Bitmap;->createHardwareBitmap(Landroid/graphics/GraphicBuffer;)Landroid/graphics/Bitmap;
	Landroid/graphics/drawable/Drawable;->isProjected()Z
	Landroid/graphics/drawable/Drawable;->updateTintFilter(Landroid/graphics/PorterDuffColorFilter;Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter;
	Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V		Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V
	Landroid/hardware/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal;		Landroid/hardware/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal;
	Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display;		Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display;

graphics/java/android/graphics/BaseCanvas.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.Size;		import android.annotation.Size;
			import android.annotation.UnsupportedAppUsage;
	import android.graphics.Canvas.VertexMode;		import android.graphics.Canvas.VertexMode;
	import android.text.GraphicsOperations;		import android.text.GraphicsOperations;
	import android.text.SpannableString;		import android.text.SpannableString;
	@@ -41,6 +42,7 @@ public abstract class BaseCanvas {
	* Should only be assigned in constructors (or setBitmap if software canvas),		* Should only be assigned in constructors (or setBitmap if software canvas),
	* freed by NativeAllocation.		* freed by NativeAllocation.
	*/		*/
			@UnsupportedAppUsage
	protected long mNativeCanvasWrapper;		protected long mNativeCanvasWrapper;

	/**		/**

graphics/java/android/graphics/Bitmap.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.annotation.ColorInt;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.Size;		import android.annotation.Size;
			import android.annotation.UnsupportedAppUsage;
	import android.content.res.ResourcesImpl;		import android.content.res.ResourcesImpl;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	@@ -52,6 +53,7 @@ public final class Bitmap implements Parcelable {
	private static final long NATIVE_ALLOCATION_SIZE = 32;		private static final long NATIVE_ALLOCATION_SIZE = 32;

	// Convenience for JNI access		// Convenience for JNI access
			@UnsupportedAppUsage
	private final long mNativePtr;		private final long mNativePtr;

	private final boolean mIsMutable;		private final boolean mIsMutable;
	@@ -70,9 +72,13 @@ public final class Bitmap implements Parcelable {
	*/		*/
	private boolean mRequestPremultiplied;		private boolean mRequestPremultiplied;

			@UnsupportedAppUsage
	private byte[] mNinePatchChunk; // may be null		private byte[] mNinePatchChunk; // may be null
			@UnsupportedAppUsage
	private NinePatch.InsetStruct mNinePatchInsets; // may be null		private NinePatch.InsetStruct mNinePatchInsets; // may be null
			@UnsupportedAppUsage
	private int mWidth;		private int mWidth;
			@UnsupportedAppUsage
	private int mHeight;		private int mHeight;
	private boolean mRecycled;		private boolean mRecycled;

	@@ -94,11 +100,13 @@ public final class Bitmap implements Parcelable {
	* density when running old apps.		* density when running old apps.
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public static void setDefaultDensity(int density) {		public static void setDefaultDensity(int density) {
	sDefaultDensity = density;		sDefaultDensity = density;
	}		}

	@SuppressWarnings("deprecation")		@SuppressWarnings("deprecation")
			@UnsupportedAppUsage
	static int getDefaultDensity() {		static int getDefaultDensity() {
	if (sDefaultDensity >= 0) {		if (sDefaultDensity >= 0) {
	return sDefaultDensity;		return sDefaultDensity;
	@@ -155,6 +163,7 @@ public final class Bitmap implements Parcelable {
	* width/height values		* width/height values
	*/		*/
	@SuppressWarnings("unused") // called from JNI		@SuppressWarnings("unused") // called from JNI
			@UnsupportedAppUsage
	void reinit(int width, int height, boolean requestPremultiplied) {		void reinit(int width, int height, boolean requestPremultiplied) {
	mWidth = width;		mWidth = width;
	mHeight = height;		mHeight = height;
	@@ -325,6 +334,7 @@ public final class Bitmap implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public void setNinePatchChunk(byte[] chunk) {		public void setNinePatchChunk(byte[] chunk) {
	mNinePatchChunk = chunk;		mNinePatchChunk = chunk;
	}		}
	@@ -510,6 +520,7 @@ public final class Bitmap implements Parcelable {
	*/		*/
	HARDWARE (7);		HARDWARE (7);

			@UnsupportedAppUsage
	final int nativeInt;		final int nativeInt;

	private static Config sConfigs[] = {		private static Config sConfigs[] = {
	@@ -520,6 +531,7 @@ public final class Bitmap implements Parcelable {
	this.nativeInt = ni;		this.nativeInt = ni;
	}		}

			@UnsupportedAppUsage
	static Config nativeToConfig(int ni) {		static Config nativeToConfig(int ni) {
	return sConfigs[ni];		return sConfigs[ni];
	}		}
	@@ -654,6 +666,7 @@ public final class Bitmap implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public Bitmap createAshmemBitmap() {		public Bitmap createAshmemBitmap() {
	checkRecycled("Can't copy a recycled bitmap");		checkRecycled("Can't copy a recycled bitmap");
	noteHardwareBitmapSlowCall();		noteHardwareBitmapSlowCall();
	@@ -672,6 +685,7 @@ public final class Bitmap implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public Bitmap createAshmemBitmap(Config config) {		public Bitmap createAshmemBitmap(Config config) {
	checkRecycled("Can't copy a recycled bitmap");		checkRecycled("Can't copy a recycled bitmap");
	noteHardwareBitmapSlowCall();		noteHardwareBitmapSlowCall();
	@@ -690,6 +704,7 @@ public final class Bitmap implements Parcelable {
	* currently PIXEL_FORMAT_RGBA_8888 is the only supported format		* currently PIXEL_FORMAT_RGBA_8888 is the only supported format
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public static Bitmap createHardwareBitmap(@NonNull GraphicBuffer graphicBuffer) {		public static Bitmap createHardwareBitmap(@NonNull GraphicBuffer graphicBuffer) {
	return nativeCreateHardwareBitmap(graphicBuffer);		return nativeCreateHardwareBitmap(graphicBuffer);
	}		}
	@@ -1390,6 +1405,7 @@ public final class Bitmap implements Parcelable {
	/**		/**
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	static public int scaleFromDensity(int size, int sdensity, int tdensity) {		static public int scaleFromDensity(int size, int sdensity, int tdensity) {
	if (sdensity == DENSITY_NONE \|\| tdensity == DENSITY_NONE \|\| sdensity == tdensity) {		if (sdensity == DENSITY_NONE \|\| tdensity == DENSITY_NONE \|\| sdensity == tdensity) {
	return size;		return size;
	@@ -1920,6 +1936,7 @@ public final class Bitmap implements Parcelable {
	* @return {@link GraphicBuffer} which is internally used by hardware bitmap		* @return {@link GraphicBuffer} which is internally used by hardware bitmap
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public GraphicBuffer createGraphicBufferHandle() {		public GraphicBuffer createGraphicBufferHandle() {
	return nativeCreateGraphicBufferHandle(mNativePtr);		return nativeCreateGraphicBufferHandle(mNativePtr);
	}		}
	@@ -1937,6 +1954,7 @@ public final class Bitmap implements Parcelable {
	private static native Bitmap nativeCopyAshmemConfig(long nativeSrcBitmap, int nativeConfig);		private static native Bitmap nativeCopyAshmemConfig(long nativeSrcBitmap, int nativeConfig);
	private static native long nativeGetNativeFinalizer();		private static native long nativeGetNativeFinalizer();
	private static native boolean nativeRecycle(long nativeBitmap);		private static native boolean nativeRecycle(long nativeBitmap);
			@UnsupportedAppUsage
	private static native void nativeReconfigure(long nativeBitmap, int width, int height,		private static native void nativeReconfigure(long nativeBitmap, int width, int height,
	int config, boolean isPremultiplied);		int config, boolean isPremultiplied);

graphics/java/android/graphics/BitmapFactory.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.graphics;

	import static android.graphics.BitmapFactory.Options.validate;		import static android.graphics.BitmapFactory.Options.validate;

			import android.annotation.UnsupportedAppUsage;
	import android.content.res.AssetManager;		import android.content.res.AssetManager;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.os.Trace;		import android.os.Trace;
	@@ -822,11 +823,15 @@ public class BitmapFactory {
	return decodeFileDescriptor(fd, null, null);		return decodeFileDescriptor(fd, null, null);
	}		}

			@UnsupportedAppUsage
	private static native Bitmap nativeDecodeStream(InputStream is, byte[] storage,		private static native Bitmap nativeDecodeStream(InputStream is, byte[] storage,
	Rect padding, Options opts);		Rect padding, Options opts);
			@UnsupportedAppUsage
	private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd,		private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd,
	Rect padding, Options opts);		Rect padding, Options opts);
			@UnsupportedAppUsage
	private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts);		private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts);
			@UnsupportedAppUsage
	private static native Bitmap nativeDecodeByteArray(byte[] data, int offset,		private static native Bitmap nativeDecodeByteArray(byte[] data, int offset,
	int length, Options opts);		int length, Options opts);
	private static native boolean nativeIsSeekable(FileDescriptor fd);		private static native boolean nativeIsSeekable(FileDescriptor fd);