Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 95f8ca9f74 to stage-aosp-master

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I7fc1162d2c63df8751a4660607e8ce72070efed8
Change-Id: I0e5a5d8fda273644e8c592ce7d059e508870085e
This commit is contained in:
Mathew Inwood
2018-08-02 12:23:41 +01:00
parent e784d5e5ca 95f8ca9f74
commit 1ddeb9e01f
59 changed files with 286 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

285
config/hiddenapi-light-greylist.txt
View File

@@ -2118,291 +2118,6 @@ Landroid/filterfw/geometry/Quad;->p3:Landroid/filterfw/geometry/Point;
Landroid/filterfw/GraphEnvironment;-><init>()V
Landroid/filterfw/GraphEnvironment;->getRunner(II)Landroid/filterfw/core/GraphRunner;
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;-><init>(JIIIZZ[BLandroid/graphics/NinePatch$InsetStruct;)V
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;->mIsMutable:Z
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/AnimatedImageDrawable;->onAnimationEnd()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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getOpticalInsets()Landroid/graphics/Insets;
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;->getStateCount()I
Landroid/graphics/drawable/StateListDrawable;->getStateDrawable(I)Landroid/graphics/drawable/Drawable;
Landroid/graphics/drawable/StateListDrawable;->getStateDrawableIndex([I)I
Landroid/graphics/drawable/StateListDrawable;->getStateSet(I)[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;->getOpticalInsets()Landroid/graphics/Insets;
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;-><init>([Ljava/lang/String;I)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/FontFamily;->mNativePtr:J
Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig;
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/ImageDecoder;->postProcessAndRelease(Landroid/graphics/Canvas;)I
Landroid/graphics/ImageFormat;->Y8:I
Landroid/graphics/Insets;->bottom:I
Landroid/graphics/Insets;->left:I
Landroid/graphics/Insets;->NONE:Landroid/graphics/Insets;
Landroid/graphics/Insets;->of(IIII)Landroid/graphics/Insets;
Landroid/graphics/Insets;->of(Landroid/graphics/Rect;)Landroid/graphics/Insets;
Landroid/graphics/Insets;->right:I
Landroid/graphics/Insets;->top: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/PorterDuffColorFilter;->setColor(I)V
Landroid/graphics/PorterDuffColorFilter;->setMode(Landroid/graphics/PorterDuff$Mode;)V
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;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;Ljava/lang/String;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;->sSystemFallbackMap:Ljava/util/Map;
Landroid/graphics/Typeface;->sSystemFontMap:Ljava/util/Map;
Landroid/graphics/Xfermode;->porterDuffMode:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_GOOD:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_IMAGER_DIRTY:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_INSUFFICIENT:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_PARTIAL:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_TOO_FAST:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ACQUIRED_TOO_SLOW:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_CANCELED:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_HW_NOT_PRESENT:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_HW_UNAVAILABLE:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_LOCKOUT:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_LOCKOUT_PERMANENT:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_NO_BIOMETRICS:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_NO_SPACE:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_TIMEOUT:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_UNABLE_TO_PROCESS:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_USER_CANCELED:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR:I
Landroid/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR_BASE:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_GOOD:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_IMAGER_DIRTY:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_INSUFFICIENT:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_PARTIAL:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_TOO_FAST:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ACQUIRED_TOO_SLOW:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_CANCELED:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_HW_NOT_PRESENT:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_HW_UNAVAILABLE:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_LOCKOUT:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_LOCKOUT_PERMANENT:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_NO_FINGERPRINTS:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_NO_SPACE:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_TIMEOUT:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_UNABLE_TO_PROCESS:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_USER_CANCELED:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR:I
Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR_BASE:I
Landroid/hardware/Camera$Parameters;->copyFrom(Landroid/hardware/Camera$Parameters;)V
Landroid/hardware/Camera$Parameters;->dump()V
Landroid/hardware/Camera$Parameters;->splitArea(Ljava/lang/String;)Ljava/util/ArrayList;

4
config/hiddenapi-vendor-list.txt
View File

@@ -100,10 +100,6 @@ Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landro
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;->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/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal;
Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display;

2
graphics/java/android/graphics/BaseCanvas.java
View File

@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.UnsupportedAppUsage;
import android.graphics.Canvas.VertexMode;
import android.text.GraphicsOperations;
import android.text.PrecomputedText;
@@ -43,6 +44,7 @@ public abstract class BaseCanvas {
* freed by NativeAllocation.
* @hide
*/
@UnsupportedAppUsage
protected long mNativeCanvasWrapper;
/**

18
graphics/java/android/graphics/Bitmap.java
View File

@@ -21,6 +21,7 @@ import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.UnsupportedAppUsage;
import android.annotation.WorkerThread;
import android.content.res.ResourcesImpl;
import android.os.Parcel;
@@ -57,6 +58,7 @@ public final class Bitmap implements Parcelable {
private static final long NATIVE_ALLOCATION_SIZE = 32;
// Convenience for JNI access
@UnsupportedAppUsage
private final long mNativePtr;
private final boolean mIsMutable;
@@ -75,9 +77,13 @@ public final class Bitmap implements Parcelable {
*/
private boolean mRequestPremultiplied;
@UnsupportedAppUsage
private byte[] mNinePatchChunk; // may be null
@UnsupportedAppUsage
private NinePatch.InsetStruct mNinePatchInsets; // may be null
@UnsupportedAppUsage
private int mWidth;
@UnsupportedAppUsage
private int mHeight;
private boolean mRecycled;
@@ -99,11 +105,13 @@ public final class Bitmap implements Parcelable {
* density when running old apps.
* @hide
*/
@UnsupportedAppUsage
public static void setDefaultDensity(int density) {
sDefaultDensity = density;
}
@SuppressWarnings("deprecation")
@UnsupportedAppUsage
static int getDefaultDensity() {
if (sDefaultDensity >= 0) {
return sDefaultDensity;
@@ -160,6 +168,7 @@ public final class Bitmap implements Parcelable {
* width/height values
*/
@SuppressWarnings("unused") // called from JNI
@UnsupportedAppUsage
void reinit(int width, int height, boolean requestPremultiplied) {
mWidth = width;
mHeight = height;
@@ -330,6 +339,7 @@ public final class Bitmap implements Parcelable {
*
* @hide
*/
@UnsupportedAppUsage
public void setNinePatchChunk(byte[] chunk) {
mNinePatchChunk = chunk;
}
@@ -530,6 +540,7 @@ public final class Bitmap implements Parcelable {
*/
HARDWARE (7);
@UnsupportedAppUsage
final int nativeInt;
private static Config sConfigs[] = {
@@ -540,6 +551,7 @@ public final class Bitmap implements Parcelable {
this.nativeInt = ni;
}
@UnsupportedAppUsage
static Config nativeToConfig(int ni) {
return sConfigs[ni];
}
@@ -674,6 +686,7 @@ public final class Bitmap implements Parcelable {
*
* @hide
*/
@UnsupportedAppUsage
public Bitmap createAshmemBitmap() {
checkRecycled("Can't copy a recycled bitmap");
noteHardwareBitmapSlowCall();
@@ -692,6 +705,7 @@ public final class Bitmap implements Parcelable {
*
* @hide
*/
@UnsupportedAppUsage
public Bitmap createAshmemBitmap(Config config) {
checkRecycled("Can't copy a recycled bitmap");
noteHardwareBitmapSlowCall();
@@ -710,6 +724,7 @@ public final class Bitmap implements Parcelable {
* currently PIXEL_FORMAT_RGBA_8888 is the only supported format
* @hide
*/
@UnsupportedAppUsage
public static Bitmap createHardwareBitmap(@NonNull GraphicBuffer graphicBuffer) {
return nativeCreateHardwareBitmap(graphicBuffer);
}
@@ -1494,6 +1509,7 @@ public final class Bitmap implements Parcelable {
/**
* @hide
*/
@UnsupportedAppUsage
static public int scaleFromDensity(int size, int sdensity, int tdensity) {
if (sdensity == DENSITY_NONE || tdensity == DENSITY_NONE || sdensity == tdensity) {
return size;
@@ -2026,6 +2042,7 @@ public final class Bitmap implements Parcelable {
* @return {@link GraphicBuffer} which is internally used by hardware bitmap
* @hide
*/
@UnsupportedAppUsage
public GraphicBuffer createGraphicBufferHandle() {
return nativeCreateGraphicBufferHandle(mNativePtr);
}
@@ -2043,6 +2060,7 @@ public final class Bitmap implements Parcelable {
private static native Bitmap nativeCopyAshmemConfig(long nativeSrcBitmap, int nativeConfig);
private static native long nativeGetNativeFinalizer();
private static native boolean nativeRecycle(long nativeBitmap);
@UnsupportedAppUsage
private static native void nativeReconfigure(long nativeBitmap, int width, int height,
int config, boolean isPremultiplied);

5
graphics/java/android/graphics/BitmapFactory.java
View File

@@ -20,6 +20,7 @@ import static android.graphics.BitmapFactory.Options.validate;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.os.Trace;
@@ -831,11 +832,15 @@ public class BitmapFactory {
return decodeFileDescriptor(fd, null, null);
}
@UnsupportedAppUsage
private static native Bitmap nativeDecodeStream(InputStream is, byte[] storage,
Rect padding, Options opts);
@UnsupportedAppUsage
private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd,
Rect padding, Options opts);
@UnsupportedAppUsage
private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts);
@UnsupportedAppUsage
private static native Bitmap nativeDecodeByteArray(byte[] data, int offset,
int length, Options opts);
private static native boolean nativeIsSeekable(FileDescriptor fd);

3
graphics/java/android/graphics/BitmapRegionDecoder.java
View File

@@ -15,6 +15,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import java.io.FileDescriptor;
@@ -165,6 +166,7 @@ public final class BitmapRegionDecoder {
This can be called from JNI code.
*/
@UnsupportedAppUsage
private BitmapRegionDecoder(long decoder) {
mNativeBitmapRegionDecoder = decoder;
mRecycled = false;
@@ -267,6 +269,7 @@ public final class BitmapRegionDecoder {
private static native int nativeGetHeight(long lbm);
private static native void nativeClean(long lbm);
@UnsupportedAppUsage
private static native BitmapRegionDecoder nativeNewInstance(
byte[] data, int offset, int length, boolean isShareable);
private static native BitmapRegionDecoder nativeNewInstance(

4
graphics/java/android/graphics/BitmapShader.java
View File

@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
/**
* Shader used to draw a bitmap as a texture. The bitmap can be repeated or
@@ -28,9 +29,12 @@ public class BitmapShader extends Shader {
* @hide
*/
@SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"})
@UnsupportedAppUsage
public Bitmap mBitmap;
@UnsupportedAppUsage
private int mTileX;
@UnsupportedAppUsage
private int mTileY;
/**

3
graphics/java/android/graphics/Camera.java
View File

@@ -16,6 +16,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
/**
* A camera instance can be used to compute 3D transformations and
* generate a matrix that can be applied, for instance, on a
@@ -174,5 +176,6 @@ public class Camera {
private native void nativeGetMatrix(long native_matrix);
private native void nativeApplyToCanvas(long native_canvas);
@UnsupportedAppUsage
long native_instance;
}

9
graphics/java/android/graphics/Canvas.java
View File

@@ -21,6 +21,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.UnsupportedAppUsage;
import android.os.Build;
import dalvik.annotation.optimization.CriticalNative;
@@ -54,6 +55,7 @@ public class Canvas extends BaseCanvas {
public static boolean sCompatibilitySetBitmap = false;
/** @hide */
@UnsupportedAppUsage
public long getNativeCanvasWrapper() {
return mNativeCanvasWrapper;
}
@@ -62,6 +64,7 @@ public class Canvas extends BaseCanvas {
public boolean isRecordingFor(Object o) { return false; }
// may be null
@UnsupportedAppUsage
private Bitmap mBitmap;
// optional field set by the caller
@@ -123,6 +126,7 @@ public class Canvas extends BaseCanvas {
}
/** @hide */
@UnsupportedAppUsage
public Canvas(long nativeCanvas) {
if (nativeCanvas == 0) {
throw new IllegalStateException();
@@ -141,6 +145,7 @@ public class Canvas extends BaseCanvas {
* @hide
*/
@Deprecated
@UnsupportedAppUsage
protected GL getGL() {
return null;
}
@@ -269,6 +274,7 @@ public class Canvas extends BaseCanvas {
}
/** @hide */
@UnsupportedAppUsage
public void setScreenDensity(int density) {
mScreenDensity = density;
}
@@ -1263,6 +1269,7 @@ public class Canvas extends BaseCanvas {
*
* @hide
*/
@UnsupportedAppUsage
public void release() {
mNativeCanvasWrapper = 0;
if (mFinalizer != null) {
@@ -1276,6 +1283,7 @@ public class Canvas extends BaseCanvas {
*
* @hide
*/
@UnsupportedAppUsage
public static void freeCaches() {
nFreeCaches();
}
@@ -1285,6 +1293,7 @@ public class Canvas extends BaseCanvas {
*
* @hide
*/
@UnsupportedAppUsage
public static void freeTextLayoutCaches() {
nFreeTextLayoutCaches();
}

3
graphics/java/android/graphics/CanvasProperty.java
View File

@@ -16,6 +16,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import com.android.internal.util.VirtualRefBasePtr;
/**
@@ -26,10 +27,12 @@ public final class CanvasProperty<T> {
private VirtualRefBasePtr mProperty;
@UnsupportedAppUsage
public static CanvasProperty<Float> createFloat(float initialValue) {
return new CanvasProperty<Float>(nCreateFloat(initialValue));
}
@UnsupportedAppUsage
public static CanvasProperty<Paint> createPaint(Paint initialValue) {
return new CanvasProperty<Paint>(nCreatePaint(initialValue.getNativeInstance()));
}

3
graphics/java/android/graphics/ColorMatrixColorFilter.java
View File

@@ -18,6 +18,7 @@ package android.graphics;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
/**
* A color filter that transforms colors through a 4x5 color matrix. This filter
@@ -26,6 +27,7 @@ import android.annotation.Nullable;
* @see ColorMatrix
*/
public class ColorMatrixColorFilter extends ColorFilter {
@UnsupportedAppUsage
private final ColorMatrix mMatrix = new ColorMatrix();
/**
@@ -76,6 +78,7 @@ public class ColorMatrixColorFilter extends ColorFilter {
*
* @hide
*/
@UnsupportedAppUsage
public void setColorMatrix(@Nullable ColorMatrix matrix) {
discardNativeInstance();
if (matrix == null) {

6
graphics/java/android/graphics/FontFamily.java
View File

@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import android.graphics.fonts.FontVariationAxis;
import android.text.TextUtils;
@@ -56,6 +57,7 @@ public class FontFamily {
// Points native font family builder. Must be zero after freezing this family.
private long mBuilderPtr;
@UnsupportedAppUsage
public FontFamily() {
mBuilderPtr = nInitBuilder(null, 0);
mNativeBuilderCleaner = sBuilderRegistry.registerNativeAllocation(this, mBuilderPtr);
@@ -80,6 +82,7 @@ public class FontFamily {
* @return boolean returns false if some error happens in native code, e.g. broken font file is
* passed, etc.
*/
@UnsupportedAppUsage
public boolean freeze() {
if (mBuilderPtr == 0) {
throw new IllegalStateException("This FontFamily is already frozen");
@@ -93,6 +96,7 @@ public class FontFamily {
return mNativePtr != 0;
}
@UnsupportedAppUsage
public void abortCreation() {
if (mBuilderPtr == 0) {
throw new IllegalStateException("This FontFamily is already frozen or abandoned");
@@ -122,6 +126,7 @@ public class FontFamily {
}
}
@UnsupportedAppUsage
public boolean addFontFromBuffer(ByteBuffer font, int ttcIndex, FontVariationAxis[] axes,
int weight, int italic) {
if (mBuilderPtr == 0) {
@@ -147,6 +152,7 @@ public class FontFamily {
* using the OS/2 table in the font.
* @return
*/
@UnsupportedAppUsage
public boolean addFontFromAssetManager(AssetManager mgr, String path, int cookie,
boolean isAsset, int ttcIndex, int weight, int isItalic,
FontVariationAxis[] axes) {

5
graphics/java/android/graphics/GraphicBuffer.java
View File

@@ -16,6 +16,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
@@ -53,6 +54,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
private final long mNativeObject;
// These two fields are only used by lock/unlockCanvas()
@@ -84,6 +86,7 @@ public class GraphicBuffer implements Parcelable {
/**
* Private use only. See {@link #create(int, int, int, int)}.
*/
@UnsupportedAppUsage
private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) {
mWidth = width;
mHeight = height;
@@ -96,6 +99,7 @@ public class GraphicBuffer implements Parcelable {
* For SurfaceControl JNI.
* @hide
*/
@UnsupportedAppUsage
public static GraphicBuffer createFromExisting(int width, int height,
int format, int usage, long unwrappedNativeObject) {
long nativeObject = nWrapGraphicBuffer(unwrappedNativeObject);
@@ -274,6 +278,7 @@ public class GraphicBuffer implements Parcelable {
nWriteGraphicBufferToParcel(mNativeObject, dest);
}
@UnsupportedAppUsage
public static final Parcelable.Creator<GraphicBuffer> CREATOR =
new Parcelable.Creator<GraphicBuffer>() {
public GraphicBuffer createFromParcel(Parcel in) {

3
graphics/java/android/graphics/ImageFormat.java
View File

@@ -16,6 +16,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
public class ImageFormat {
/*
* these constants are chosen to be binary compatible with their previous
@@ -103,6 +105,7 @@ public class ImageFormat {
*
* @hide
*/
@UnsupportedAppUsage
public static final int Y8 = 0x20203859;
/**

3
graphics/java/android/graphics/LightingColorFilter.java
View File

@@ -22,6 +22,7 @@
package android.graphics;
import android.annotation.ColorInt;
import android.annotation.UnsupportedAppUsage;
/**
* A color filter that can be used to simulate simple lighting effects.
@@ -72,6 +73,7 @@ public class LightingColorFilter extends ColorFilter {
*
* @hide
*/
@UnsupportedAppUsage
public void setColorMultiply(@ColorInt int mul) {
if (mMul != mul) {
mMul = mul;
@@ -97,6 +99,7 @@ public class LightingColorFilter extends ColorFilter {
*
* @hide
*/
@UnsupportedAppUsage
public void setColorAdd(@ColorInt int add) {
if (mAdd != add) {
mAdd = add;

10
graphics/java/android/graphics/LinearGradient.java
View File

@@ -19,6 +19,7 @@ package android.graphics;
import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
public class LinearGradient extends Shader {
@@ -31,15 +32,24 @@ public class LinearGradient extends Shader {
*/
private int mType;
@UnsupportedAppUsage
private float mX0;
@UnsupportedAppUsage
private float mY0;
@UnsupportedAppUsage
private float mX1;
@UnsupportedAppUsage
private float mY1;
@UnsupportedAppUsage
private int[] mColors;
@UnsupportedAppUsage
private float[] mPositions;
@UnsupportedAppUsage
private int mColor0;
@UnsupportedAppUsage
private int mColor1;
@UnsupportedAppUsage
private TileMode mTileMode;
/**

3
graphics/java/android/graphics/Matrix.java
View File

@@ -21,6 +21,7 @@ import dalvik.annotation.optimization.FastNative;
import libcore.util.NativeAllocationRegistry;
import android.annotation.UnsupportedAppUsage;
import java.io.PrintWriter;
/**
@@ -39,6 +40,7 @@ public class Matrix {
public static final int MPERSP_2 = 8; //!< use with getValues/setValues
/** @hide */
@UnsupportedAppUsage
public final static Matrix IDENTITY_MATRIX = new Matrix() {
void oops() {
throw new IllegalStateException("Matrix can not be modified");
@@ -231,6 +233,7 @@ public class Matrix {
/**
* @hide
*/
@UnsupportedAppUsage
public final long native_instance;
/**

3
graphics/java/android/graphics/Movie.java
View File

@@ -16,6 +16,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import java.io.FileInputStream;
@@ -25,8 +26,10 @@ import java.io.InputStream;
* @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.
*/
public class Movie {
@UnsupportedAppUsage
private long mNativeMovie;
@UnsupportedAppUsage
private Movie(long nativeMovie) {
if (nativeMovie == 0) {
throw new RuntimeException("native movie creation failed");

5
graphics/java/android/graphics/NinePatch.java
View File

@@ -16,6 +16,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
/**
* The NinePatch class permits drawing a bitmap in nine or more sections.
* Essentially, it allows the creation of custom graphics that will scale the
@@ -41,6 +43,7 @@ public class NinePatch {
*/
public static class InsetStruct {
@SuppressWarnings({"UnusedDeclaration"}) // called from JNI
@UnsupportedAppUsage
InsetStruct(int opticalLeft, int opticalTop, int opticalRight, int opticalBottom,
int outlineLeft, int outlineTop, int outlineRight, int outlineBottom,
float outlineRadius, int outlineAlpha, float decodeScale) {
@@ -77,6 +80,7 @@ public class NinePatch {
}
}
@UnsupportedAppUsage
private final Bitmap mBitmap;
/**
@@ -84,6 +88,7 @@ public class NinePatch {
*
* @hide
*/
@UnsupportedAppUsage
public long mNativeChunk;
private Paint mPaint;

2
graphics/java/android/graphics/Outline.java
View File

@@ -19,6 +19,7 @@ package android.graphics;
import android.annotation.FloatRange;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.graphics.drawable.Drawable;
import java.lang.annotation.Retention;
@@ -66,6 +67,7 @@ public final class Outline {
public Path mPath;
/** @hide */
@UnsupportedAppUsage
public final Rect mRect = new Rect();
/** @hide */
public float mRadius = RADIUS_UNDEFINED;

9
graphics/java/android/graphics/Paint.java
View File

@@ -19,6 +19,8 @@ package android.graphics;
import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Size;
import android.annotation.UnsupportedAppUsage;
import android.graphics.FontListParser;
import android.graphics.fonts.FontVariationAxis;
import android.os.LocaleList;
import android.text.GraphicsOperations;
@@ -44,6 +46,7 @@ import java.util.Locale;
*/
public class Paint {
@UnsupportedAppUsage
private long mNativePaint;
private long mNativeShader;
private long mNativeColorFilter;
@@ -61,6 +64,7 @@ public class Paint {
private MaskFilter mMaskFilter;
private PathEffect mPathEffect;
private Shader mShader;
@UnsupportedAppUsage
private Typeface mTypeface;
private Xfermode mXfermode;
@@ -618,6 +622,7 @@ public class Paint {
}
/** @hide */
@UnsupportedAppUsage
public void setCompatibilityScaling(float factor) {
if (factor == 1.0) {
mHasCompatScaling = false;
@@ -635,6 +640,7 @@ public class Paint {
*
* @hide
*/
@UnsupportedAppUsage
public long getNativeInstance() {
long newNativeShader = mShader == null ? 0 : mShader.getNativeInstance();
if (newNativeShader != mNativeShader) {
@@ -1718,6 +1724,7 @@ public class Paint {
*
* @hide
*/
@UnsupportedAppUsage
public void setHyphenEdit(int hyphen) {
nSetHyphenEdit(mNativePaint, hyphen);
}
@@ -2261,6 +2268,7 @@ public class Paint {
* @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int)
* @hide
*/
@UnsupportedAppUsage
public float getTextRunAdvances(char[] chars, int index, int count,
int contextIndex, int contextCount, boolean isRtl, float[] advances,
int advancesIndex) {
@@ -2451,6 +2459,7 @@ public class Paint {
* @return the offset of the next position, or -1
* @hide
*/
@UnsupportedAppUsage
public int getTextRunCursor(char[] text, int contextStart, int contextLength,
int dir, int offset, int cursorOpt) {
int contextEnd = contextStart + contextLength;

3
graphics/java/android/graphics/Path.java
View File

@@ -20,6 +20,7 @@ import android.annotation.FloatRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Size;
import android.annotation.UnsupportedAppUsage;
import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative;
@@ -46,10 +47,12 @@ public class Path {
/**
* @hide
*/
@UnsupportedAppUsage
public boolean isSimplePath = true;
/**
* @hide
*/
@UnsupportedAppUsage
public Region rects;
private Direction mLastDirection = null;

2
graphics/java/android/graphics/Picture.java
View File

@@ -16,6 +16,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import java.io.InputStream;
import java.io.OutputStream;
@@ -32,6 +33,7 @@ import java.io.OutputStream;
*/
public class Picture {
private PictureCanvas mRecordingCanvas;
@UnsupportedAppUsage
private long mNativePicture;
private boolean mRequiresHwAcceleration;

3
graphics/java/android/graphics/PorterDuff.java
View File

@@ -16,6 +16,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
/**
* <p>This class contains the list of alpha compositing and blending modes
* that can be passed to {@link PorterDuffXfermode}, a specialized implementation
@@ -364,6 +366,7 @@ public class PorterDuff {
/**
* @hide
*/
@UnsupportedAppUsage
public final int nativeInt;
}

3
graphics/java/android/graphics/PorterDuffColorFilter.java
View File

@@ -18,6 +18,7 @@ package android.graphics;
import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
/**
* A color filter that can be used to tint the source pixels using a single
@@ -53,6 +54,7 @@ public class PorterDuffColorFilter extends ColorFilter {
* @hide
*/
@ColorInt
@UnsupportedAppUsage
public int getColor() {
return mColor;
}
@@ -85,6 +87,7 @@ public class PorterDuffColorFilter extends ColorFilter {
*
* @hide
*/
@UnsupportedAppUsage
public PorterDuff.Mode getMode() {
return mMode;
}

9
graphics/java/android/graphics/RadialGradient.java
View File

@@ -19,6 +19,7 @@ package android.graphics;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.ColorInt;
import android.annotation.UnsupportedAppUsage;
public class RadialGradient extends Shader {
@@ -31,14 +32,22 @@ public class RadialGradient extends Shader {
*/
private int mType;
@UnsupportedAppUsage
private float mX;
@UnsupportedAppUsage
private float mY;
@UnsupportedAppUsage
private float mRadius;
@UnsupportedAppUsage
private int[] mColors;
@UnsupportedAppUsage
private float[] mPositions;
@UnsupportedAppUsage
private int mCenterColor;
@UnsupportedAppUsage
private int mEdgeColor;
@UnsupportedAppUsage
private TileMode mTileMode;
/**

3
graphics/java/android/graphics/Rect.java
View File

@@ -21,6 +21,7 @@ import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;
import android.annotation.UnsupportedAppUsage;
import android.text.TextUtils;
import android.util.proto.ProtoOutputStream;
import java.io.PrintWriter;
@@ -201,6 +202,7 @@ public final class Rect implements Parcelable {
* Print short representation to given writer.
* @hide
*/
@UnsupportedAppUsage
public void printShortString(PrintWriter pw) {
pw.print('['); pw.print(left); pw.print(',');
pw.print(top); pw.print("]["); pw.print(right);
@@ -685,6 +687,7 @@ public final class Rect implements Parcelable {
* Scales up the rect by the given scale.
* @hide
*/
@UnsupportedAppUsage
public void scale(float scale) {
if (scale != 1.0f) {
left = (int) (left * scale + 0.5f);

6
graphics/java/android/graphics/Region.java
View File

@@ -16,6 +16,7 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.Pools.SynchronizedPool;
@@ -30,6 +31,7 @@ public class Region implements Parcelable {
/**
* @hide
*/
@UnsupportedAppUsage
public long mNativeRegion;
// the native values for these must match up with the enum in SkRegion.h
@@ -48,6 +50,7 @@ public class Region implements Parcelable {
/**
* @hide
*/
@UnsupportedAppUsage
public final int nativeInt;
}
@@ -236,6 +239,7 @@ public class Region implements Parcelable {
*
* @hide
*/
@UnsupportedAppUsage
public void scale(float scale) {
scale(scale, null);
}
@@ -327,6 +331,7 @@ public class Region implements Parcelable {
*
* @hide
*/
@UnsupportedAppUsage
public void recycle() {
setEmpty();
sPool.release(this);
@@ -395,6 +400,7 @@ public class Region implements Parcelable {
/* add dummy parameter so constructor can be called from jni without
triggering 'not cloneable' exception */
@UnsupportedAppUsage
private Region(long ni, int dummy) {
this(ni);
}

2
graphics/java/android/graphics/Shader.java
View File

@@ -18,6 +18,7 @@ package android.graphics;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import libcore.util.NativeAllocationRegistry;
@@ -72,6 +73,7 @@ public class Shader {
TileMode(int nativeInt) {
this.nativeInt = nativeInt;
}
@UnsupportedAppUsage
final int nativeInt;
}

7
graphics/java/android/graphics/SurfaceTexture.java
View File

@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -68,13 +69,17 @@ import java.lang.ref.WeakReference;
*/
public class SurfaceTexture {
private final Looper mCreatorLooper;
@UnsupportedAppUsage
private Handler mOnFrameAvailableHandler;
/**
* These fields are used by native code, do not access or modify.
*/
@UnsupportedAppUsage
private long mSurfaceTexture;
@UnsupportedAppUsage
private long mProducer;
@UnsupportedAppUsage
private long mFrameAvailableListener;
private boolean mIsSingleBuffered;
@@ -378,6 +383,7 @@ public class SurfaceTexture {
* This method is invoked from native code only.
*/
@SuppressWarnings({"UnusedDeclaration"})
@UnsupportedAppUsage
private static void postEventFromNative(WeakReference<SurfaceTexture> weakSelf) {
SurfaceTexture st = weakSelf.get();
if (st != null) {
@@ -405,6 +411,7 @@ public class SurfaceTexture {
private native void nativeSetDefaultBufferSize(int width, int height);
private native void nativeUpdateTexImage();
private native void nativeReleaseTexImage();
@UnsupportedAppUsage
private native int nativeDetachFromGLContext();
private native int nativeAttachToGLContext(int texName);
private native void nativeRelease();

7
graphics/java/android/graphics/SweepGradient.java
View File

@@ -19,6 +19,7 @@ package android.graphics;
import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
public class SweepGradient extends Shader {
@@ -31,11 +32,17 @@ public class SweepGradient extends Shader {
*/
private int mType;
@UnsupportedAppUsage
private float mCx;
@UnsupportedAppUsage
private float mCy;
@UnsupportedAppUsage
private int[] mColors;
@UnsupportedAppUsage
private float[] mPositions;
@UnsupportedAppUsage
private int mColor0;
@UnsupportedAppUsage
private int mColor1;
/**

3
graphics/java/android/graphics/TableMaskFilter.java
View File

@@ -16,6 +16,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
/**
* @hide
*/
@@ -32,6 +34,7 @@ public class TableMaskFilter extends MaskFilter {
native_instance = ni;
}
@UnsupportedAppUsage
public static TableMaskFilter CreateClipTable(int min, int max) {
return new TableMaskFilter(nativeNewClip(min, max));
}

3
graphics/java/android/graphics/TemporaryBuffer.java
View File

@@ -16,12 +16,14 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
import com.android.internal.util.ArrayUtils;
/**
* @hide
*/
public class TemporaryBuffer {
@UnsupportedAppUsage
public static char[] obtain(int len) {
char[] buf;
@@ -37,6 +39,7 @@ public class TemporaryBuffer {
return buf;
}
@UnsupportedAppUsage
public static void recycle(char[] temp) {
if (temp.length > 1000) return;

11
graphics/java/android/graphics/Typeface.java
View File

@@ -25,6 +25,7 @@ import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import android.graphics.fonts.FontVariationAxis;
import android.net.Uri;
@@ -93,6 +94,7 @@ public class Typeface {
/** The NORMAL style of the default monospace typeface. */
public static final Typeface MONOSPACE;
@UnsupportedAppUsage
static Typeface[] sDefaults;
/**
@@ -119,12 +121,14 @@ public class Typeface {
private static final Object sDynamicCacheLock = new Object();
static Typeface sDefaultTypeface;
@UnsupportedAppUsage
static final Map<String, Typeface> sSystemFontMap;
static final Map<String, FontFamily[]> sSystemFallbackMap;
/**
* @hide
*/
@UnsupportedAppUsage
public long native_instance;
/** @hide */
@@ -139,6 +143,7 @@ public class Typeface {
public static final int BOLD_ITALIC = 3;
/** @hide */ public static final int STYLE_MASK = 0x03;
@UnsupportedAppUsage
private @Style int mStyle = 0;
/**
@@ -162,6 +167,7 @@ public class Typeface {
private int[] mSupportedAxes;
private static final int[] EMPTY_AXES = {};
@UnsupportedAppUsage
private static void setDefault(Typeface t) {
sDefaultTypeface = t;
nativeSetDefault(t.native_instance);
@@ -891,6 +897,7 @@ public class Typeface {
*
* @param families array of font families
*/
@UnsupportedAppUsage
private static Typeface createFromFamilies(FontFamily[] families) {
long[] ptrArray = new long[families.length];
for (int i = 0; i < families.length; i++) {
@@ -922,6 +929,7 @@ public class Typeface {
* closest to the regular weight and upright font is used.
* @param families array of font families
*/
@UnsupportedAppUsage
private static Typeface createFromFamiliesWithDefault(FontFamily[] families,
String fallbackName, int weight, int italic) {
FontFamily[] fallback = sSystemFallbackMap.get(fallbackName);
@@ -939,6 +947,7 @@ public class Typeface {
}
// don't allow clients to call this directly
@UnsupportedAppUsage
private Typeface(long ni) {
if (ni == 0) {
throw new RuntimeException("native typeface cannot be made");
@@ -1197,7 +1206,9 @@ public class Typeface {
// TODO: clean up: change List<FontVariationAxis> to FontVariationAxis[]
private static native long nativeCreateFromTypefaceWithVariation(
long native_instance, List<FontVariationAxis> axes);
@UnsupportedAppUsage
private static native long nativeCreateWeightAlias(long native_instance, int weight);
@UnsupportedAppUsage
private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic);
private static native int[] nativeGetSupportedAxes(long native_instance);

3
graphics/java/android/graphics/Xfermode.java
View File

@@ -21,6 +21,8 @@
package android.graphics;
import android.annotation.UnsupportedAppUsage;
/**
* Xfermode is the base class for objects that are called to implement custom
* "transfer-modes" in the drawing pipeline. The static function Create(Modes)
@@ -30,5 +32,6 @@ package android.graphics;
*/
public class Xfermode {
static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt;
@UnsupportedAppUsage
int porterDuffMode = DEFAULT;
}

3
graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java
View File

@@ -18,6 +18,7 @@ package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.content.res.Resources;
@@ -202,11 +203,13 @@ public class AnimatedRotateDrawable extends DrawableWrapper implements Animatabl
R.styleable.AnimatedRotateDrawable_frameDuration, state.mFrameDuration));
}
@UnsupportedAppUsage
public void setFramesCount(int framesCount) {
mState.mFramesCount = framesCount;
mIncrement = 360.0f / mState.mFramesCount;
}
@UnsupportedAppUsage
public void setFramesDuration(int framesDuration) {
mState.mFrameDuration = framesDuration;
}

4
graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
View File

@@ -20,6 +20,7 @@ import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
@@ -66,6 +67,7 @@ public class AnimatedStateListDrawable extends StateListDrawable {
private static final String ELEMENT_TRANSITION = "transition";
private static final String ELEMENT_ITEM = "item";
@UnsupportedAppUsage
private AnimatedStateListState mState;
/** The currently running transition, if any. */
@@ -558,7 +560,9 @@ public class AnimatedStateListDrawable extends StateListDrawable {
int[] mAnimThemeAttrs;
@UnsupportedAppUsage
LongSparseLongArray mTransitions;
@UnsupportedAppUsage
SparseIntArray mStateIds;
AnimatedStateListState(@Nullable AnimatedStateListState orig,

5
graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
View File

@@ -25,6 +25,7 @@ import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.app.ActivityThread;
import android.app.Application;
import android.content.pm.ActivityInfo.Config;
@@ -304,6 +305,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
private static final boolean DBG_ANIMATION_VECTOR_DRAWABLE = false;
/** Local, mutable animator set. */
@UnsupportedAppUsage
private VectorDrawableAnimator mAnimatorSet;
/**
@@ -312,6 +314,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
*/
private Resources mRes;
@UnsupportedAppUsage
private AnimatedVectorDrawableState mAnimatedVectorState;
/** The animator set that is parsed from the xml. */
@@ -641,6 +644,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
* Force to animate on UI thread.
* @hide
*/
@UnsupportedAppUsage
public void forceAnimationOnUI() {
if (mAnimatorSet instanceof VectorDrawableAnimatorRT) {
VectorDrawableAnimatorRT animator = (VectorDrawableAnimatorRT) mAnimatorSet;
@@ -1771,6 +1775,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
}
// onFinished: should be called from native
@UnsupportedAppUsage
private static void callOnFinished(VectorDrawableAnimatorRT set, int id) {
set.onAnimationEnd(id);
}

2
graphics/java/android/graphics/drawable/AnimationDrawable.java
View File

@@ -24,6 +24,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
@@ -88,6 +89,7 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
private AnimationState mAnimationState;
/** The current frame, ranging from 0 to {@link #mAnimationState#getChildCount() - 1} */
@UnsupportedAppUsage
private int mCurFrame = 0;
/** Whether the drawable has an animation callback posted. */

6
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -17,6 +17,7 @@
package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -88,9 +89,11 @@ public class BitmapDrawable extends Drawable {
private final Rect mDstRect = new Rect(); // #updateDstRectAndInsetsIfDirty() sets this
@UnsupportedAppUsage
private BitmapState mBitmapState;
private PorterDuffColorFilter mTintFilter;
@UnsupportedAppUsage
private int mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;
private boolean mDstRectAndInsetsDirty = true;
@@ -238,6 +241,7 @@ public class BitmapDrawable extends Drawable {
}
/** @hide */
@UnsupportedAppUsage
public void setBitmap(Bitmap bitmap) {
if (mBitmapState.mBitmap != bitmap) {
mBitmapState.mBitmap = bitmap;
@@ -696,6 +700,7 @@ public class BitmapDrawable extends Drawable {
/**
* @hide only needed by a hack within ProgressBar
*/
@UnsupportedAppUsage
public ColorStateList getTint() {
return mBitmapState.mTint;
}
@@ -703,6 +708,7 @@ public class BitmapDrawable extends Drawable {
/**
* @hide only needed by a hack within ProgressBar
*/
@UnsupportedAppUsage
public Mode getTintMode() {
return mBitmapState.mTintMode;
}

2
graphics/java/android/graphics/drawable/ClipDrawable.java
View File

@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
@@ -58,6 +59,7 @@ public class ClipDrawable extends DrawableWrapper {
private final Rect mTmpRect = new Rect();
@UnsupportedAppUsage
private ClipState mState;
ClipDrawable() {

3
graphics/java/android/graphics/drawable/ColorDrawable.java
View File

@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.graphics.*;
import android.graphics.PorterDuff.Mode;
@@ -46,6 +47,7 @@ import java.io.IOException;
* @attr ref android.R.styleable#ColorDrawable_color
*/
public class ColorDrawable extends Drawable {
@UnsupportedAppUsage
private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@ViewDebug.ExportedProperty(deepExport = true, prefix = "state_")
@@ -319,6 +321,7 @@ public class ColorDrawable extends Drawable {
int[] mThemeAttrs;
int mBaseColor; // base color, independent of setAlpha()
@ViewDebug.ExportedProperty
@UnsupportedAppUsage
int mUseColor; // basecolor modulated by setAlpha()
@Config int mChangingConfigurations;
ColorStateList mTint = null;

7
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -27,6 +27,7 @@ import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -186,6 +187,7 @@ public abstract class Drawable {
private int mLevel = 0;
private @Config int mChangingConfigurations = 0;
private Rect mBounds = ZERO_BOUNDS_RECT; // lazily becomes a new Rect()
@UnsupportedAppUsage
private WeakReference<Callback> mCallback = null;
private boolean mVisible = true;
@@ -204,6 +206,7 @@ public abstract class Drawable {
*
* @hide
*/
@UnsupportedAppUsage
protected int mSrcDensityOverride = 0;
/**
@@ -714,6 +717,7 @@ public abstract class Drawable {
*
* @hide magic!
*/
@UnsupportedAppUsage
public boolean isProjected() {
return false;
}
@@ -1390,6 +1394,7 @@ public abstract class Drawable {
* @throws XmlPullParserException
* @throws IOException
*/
@UnsupportedAppUsage
void inflateWithAttributes(@NonNull @SuppressWarnings("unused") Resources r,
@NonNull @SuppressWarnings("unused") XmlPullParser parser, @NonNull TypedArray attrs,
@AttrRes int visibleAttr) throws XmlPullParserException, IOException {
@@ -1509,6 +1514,7 @@ public abstract class Drawable {
* Ensures the tint filter is consistent with the current tint color and
* mode.
*/
@UnsupportedAppUsage
@Nullable PorterDuffColorFilter updateTintFilter(@Nullable PorterDuffColorFilter tintFilter,
@Nullable ColorStateList tint, @Nullable PorterDuff.Mode tintMode) {
if (tint == null || tintMode == null) {
@@ -1615,6 +1621,7 @@ public abstract class Drawable {
*
* @hide
*/
@UnsupportedAppUsage
public static PorterDuff.Mode parseTintMode(int value, Mode defaultMode) {
switch (value) {
case 3: return Mode.SRC_OVER;

7
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -17,6 +17,7 @@
package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -54,9 +55,11 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
* to improve the quality at negligible cost.
*/
private static final boolean DEFAULT_DITHER = true;
@UnsupportedAppUsage
private DrawableContainerState mDrawableContainerState;
private Rect mHotspotBounds;
private Drawable mCurrDrawable;
@UnsupportedAppUsage
private Drawable mLastDrawable;
private int mAlpha = 0xFF;
@@ -689,11 +692,13 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Config int mChildrenChangingConfigurations;
SparseArray<ConstantState> mDrawableFutures;
@UnsupportedAppUsage
Drawable[] mDrawables;
int mNumChildren;
boolean mVariablePadding = false;
boolean mCheckedPadding;
@UnsupportedAppUsage
Rect mConstantPadding;
boolean mConstantSize = false;
@@ -723,6 +728,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
boolean mAutoMirrored;
ColorFilter mColorFilter;
@UnsupportedAppUsage
boolean mHasColorFilter;
ColorStateList mTintList;
@@ -733,6 +739,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
/**
* @hide
*/
@UnsupportedAppUsage
protected DrawableContainerState(DrawableContainerState orig, DrawableContainer owner,
Resources res) {
mOwner = owner;

2
graphics/java/android/graphics/drawable/DrawableInflater.java
View File

@@ -22,6 +22,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
@@ -49,6 +50,7 @@ public final class DrawableInflater {
new HashMap<>();
private final Resources mRes;
@UnsupportedAppUsage
private final ClassLoader mClassLoader;
/**

2
graphics/java/android/graphics/drawable/DrawableWrapper.java
View File

@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -45,6 +46,7 @@ import java.io.IOException;
* Drawable container with only one child element.
*/
public abstract class DrawableWrapper extends Drawable implements Drawable.Callback {
@UnsupportedAppUsage
private DrawableWrapperState mState;
private Drawable mDrawable;
private boolean mMutated;

24
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -155,10 +156,14 @@ public class GradientDrawable extends Drawable {
private static final float DEFAULT_INNER_RADIUS_RATIO = 3.0f;
private static final float DEFAULT_THICKNESS_RATIO = 9.0f;
@UnsupportedAppUsage
private GradientState mGradientState;
@UnsupportedAppUsage
private final Paint mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
@UnsupportedAppUsage
private Rect mPadding;
@UnsupportedAppUsage
private Paint mStrokePaint; // optional, set by the caller
private ColorFilter mColorFilter; // optional, set by the caller
private PorterDuffColorFilter mTintFilter;
@@ -1793,27 +1798,46 @@ public class GradientDrawable extends Drawable {
final static class GradientState extends ConstantState {
public @Config int mChangingConfigurations;
@UnsupportedAppUsage
public @Shape int mShape = RECTANGLE;
@UnsupportedAppUsage
public @GradientType int mGradient = LINEAR_GRADIENT;
@UnsupportedAppUsage
public int mAngle = 0;
@UnsupportedAppUsage
public Orientation mOrientation;
@UnsupportedAppUsage
public ColorStateList mSolidColors;
public ColorStateList mStrokeColors;
@UnsupportedAppUsage
public @ColorInt int[] mGradientColors;
public @ColorInt int[] mTempColors; // no need to copy
public float[] mTempPositions; // no need to copy
@UnsupportedAppUsage
public float[] mPositions;
@UnsupportedAppUsage
public int mStrokeWidth = -1; // if >= 0 use stroking.
@UnsupportedAppUsage
public float mStrokeDashWidth = 0.0f;
@UnsupportedAppUsage
public float mStrokeDashGap = 0.0f;
@UnsupportedAppUsage
public float mRadius = 0.0f; // use this if mRadiusArray is null
@UnsupportedAppUsage
public float[] mRadiusArray = null;
@UnsupportedAppUsage
public Rect mPadding = null;
@UnsupportedAppUsage
public int mWidth = -1;
@UnsupportedAppUsage
public int mHeight = -1;
@UnsupportedAppUsage
public float mInnerRadiusRatio = DEFAULT_INNER_RADIUS_RATIO;
@UnsupportedAppUsage
public float mThicknessRatio = DEFAULT_THICKNESS_RATIO;
@UnsupportedAppUsage
public int mInnerRadius = -1;
@UnsupportedAppUsage
public int mThickness = -1;
public boolean mDither = false;
public Insets mOpticalInsets = Insets.NONE;

10
graphics/java/android/graphics/drawable/Icon.java
View File

@@ -21,6 +21,7 @@ import android.annotation.DrawableRes;
import android.annotation.IdRes;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -99,6 +100,7 @@ public final class Icon implements Parcelable {
private static final int VERSION_STREAM_SERIALIZER = 1;
@UnsupportedAppUsage
private final int mType;
private ColorStateList mTintList;
@@ -115,6 +117,7 @@ public final class Icon implements Parcelable {
// TYPE_RESOURCE: package name
// TYPE_URI: uri string
@UnsupportedAppUsage
private String mString1;
// TYPE_RESOURCE: resId
@@ -139,6 +142,7 @@ public final class Icon implements Parcelable {
* @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} Icon.
* @hide
*/
@UnsupportedAppUsage
public Bitmap getBitmap() {
if (mType != TYPE_BITMAP && mType != TYPE_ADAPTIVE_BITMAP) {
throw new IllegalStateException("called getBitmap() on " + this);
@@ -154,6 +158,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
public int getDataLength() {
if (mType != TYPE_DATA) {
throw new IllegalStateException("called getDataLength() on " + this);
@@ -168,6 +173,7 @@ public final class Icon implements Parcelable {
* valid compressed bitmap data is found.
* @hide
*/
@UnsupportedAppUsage
public int getDataOffset() {
if (mType != TYPE_DATA) {
throw new IllegalStateException("called getDataOffset() on " + this);
@@ -182,6 +188,7 @@ public final class Icon implements Parcelable {
* bitmap data.
* @hide
*/
@UnsupportedAppUsage
public byte[] getDataBytes() {
if (mType != TYPE_DATA) {
throw new IllegalStateException("called getDataBytes() on " + this);
@@ -195,6 +202,7 @@ public final class Icon implements Parcelable {
* @return The {@link android.content.res.Resources} for this {@link #TYPE_RESOURCE} Icon.
* @hide
*/
@UnsupportedAppUsage
public Resources getResources() {
if (mType != TYPE_RESOURCE) {
throw new IllegalStateException("called getResources() on " + this);
@@ -560,6 +568,7 @@ public final class Icon implements Parcelable {
* Version of createWithResource that takes Resources. Do not use.
* @hide
*/
@UnsupportedAppUsage
public static Icon createWithResource(Resources res, @DrawableRes int resId) {
if (res == null) {
throw new IllegalArgumentException("Resource must not be null.");
@@ -692,6 +701,7 @@ public final class Icon implements Parcelable {
}
/** @hide */
@UnsupportedAppUsage
public boolean hasTint() {
return (mTintList != null) || (mTintMode != DEFAULT_TINT_MODE);
}

2
graphics/java/android/graphics/drawable/InsetDrawable.java
View File

@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
@@ -57,6 +58,7 @@ public class InsetDrawable extends DrawableWrapper {
private final Rect mTmpRect = new Rect();
private final Rect mTmpInsetRect = new Rect();
@UnsupportedAppUsage
private InsetState mState;
/**

6
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -18,6 +18,7 @@ package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -93,6 +94,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
public static final int INSET_UNDEFINED = Integer.MIN_VALUE;
@NonNull
@UnsupportedAppUsage
LayerState mLayerState;
private int[] mPaddingL;
@@ -428,6 +430,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
* @param layer The layer to add.
* @return The index of the layer.
*/
@UnsupportedAppUsage
int addLayer(@NonNull ChildDrawable layer) {
final LayerState st = mLayerState;
final int N = st.mChildren != null ? st.mChildren.length : 0;
@@ -1739,6 +1742,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
/**
* Ensures the child padding caches are large enough.
*/
@UnsupportedAppUsage
void ensurePadding() {
final int N = mLayerState.mNumChildren;
if (mPaddingL != null && mPaddingL.length >= N) {
@@ -1820,6 +1824,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
}
static class ChildDrawable {
@UnsupportedAppUsage
public Drawable mDrawable;
public int[] mThemeAttrs;
public int mDensity = DisplayMetrics.DENSITY_DEFAULT;
@@ -1922,6 +1927,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
private int[] mThemeAttrs;
int mNumChildren;
@UnsupportedAppUsage
ChildDrawable[] mChildren;
int mDensity;

3
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -18,6 +18,7 @@ package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -70,6 +71,7 @@ public class NinePatchDrawable extends Drawable {
/** Temporary rect used for density scaling. */
private Rect mTempRect;
@UnsupportedAppUsage
private NinePatchState mNinePatchState;
private PorterDuffColorFilter mTintFilter;
private Rect mPadding;
@@ -591,6 +593,7 @@ public class NinePatchDrawable extends Drawable {
@Config int mChangingConfigurations;
// Values loaded during inflation.
@UnsupportedAppUsage
NinePatch mNinePatch = null;
ColorStateList mTint = null;
Mode mTintMode = DEFAULT_TINT_MODE;

6
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -18,6 +18,7 @@ package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -120,6 +121,7 @@ public class RippleDrawable extends LayerDrawable {
private final Rect mDirtyBounds = new Rect();
/** Mirrors mLayerState with some extra information. */
@UnsupportedAppUsage
private RippleState mState;
/** The masking layer, e.g. the layer with id R.id.mask. */
@@ -157,6 +159,7 @@ public class RippleDrawable extends LayerDrawable {
private Paint mRipplePaint;
/** Target density of the display into which ripples are drawn. */
@UnsupportedAppUsage
private int mDensity;
/** Whether bounds are being overridden. */
@@ -857,6 +860,7 @@ public class RippleDrawable extends LayerDrawable {
mMask.draw(canvas);
}
@UnsupportedAppUsage
Paint getRipplePaint() {
if (mRipplePaint == null) {
mRipplePaint = new Paint();
@@ -942,6 +946,7 @@ public class RippleDrawable extends LayerDrawable {
* @param forceSoftware true if RenderThread animations should be disabled, false otherwise
* @hide
*/
@UnsupportedAppUsage
public void setForceSoftware(boolean forceSoftware) {
mForceSoftware = forceSoftware;
}
@@ -972,6 +977,7 @@ public class RippleDrawable extends LayerDrawable {
static class RippleState extends LayerState {
int[] mTouchThemeAttrs;
@UnsupportedAppUsage
ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA);
int mMaxRadius = RADIUS_AUTO;

2
graphics/java/android/graphics/drawable/RotateDrawable.java
View File

@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.content.res.Resources;
@@ -54,6 +55,7 @@ import java.io.IOException;
public class RotateDrawable extends DrawableWrapper {
private static final int MAX_LEVEL = 10000;
@UnsupportedAppUsage
private RotateState mState;
/**

2
graphics/java/android/graphics/drawable/ScaleDrawable.java
View File

@@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
@@ -66,6 +67,7 @@ public class ScaleDrawable extends DrawableWrapper {
private final Rect mTmpRect = new Rect();
@UnsupportedAppUsage
private ScaleState mState;
ScaleDrawable() {

5
graphics/java/android/graphics/drawable/StateListDrawable.java
View File

@@ -26,6 +26,7 @@ import java.util.Arrays;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
@@ -63,6 +64,7 @@ public class StateListDrawable extends DrawableContainer {
private static final boolean DEBUG = false;
@UnsupportedAppUsage
private StateListState mStateListState;
private boolean mMutated;
@@ -127,6 +129,7 @@ public class StateListDrawable extends DrawableContainer {
/**
* Updates the constant state from the values in the typed array.
*/
@UnsupportedAppUsage
private void updateStateFromTypedArray(TypedArray a) {
final StateListState state = mStateListState;
@@ -204,6 +207,7 @@ public class StateListDrawable extends DrawableContainer {
* @param attrs The attribute set.
* @return An array of state_ attributes.
*/
@UnsupportedAppUsage
int[] extractStateSet(AttributeSet attrs) {
int j = 0;
final int numAttrs = attrs.getAttributeCount();
@@ -331,6 +335,7 @@ public class StateListDrawable extends DrawableContainer {
mStateSets = stateSets;
}
@UnsupportedAppUsage
int addStateSet(int[] stateSet, Drawable drawable) {
final int pos = addChild(drawable);
mStateSets[pos] = stateSet;

4
graphics/java/android/graphics/drawable/TransitionDrawable.java
View File

@@ -16,6 +16,7 @@
package android.graphics.drawable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.Resources;
import android.graphics.Canvas;
@@ -65,10 +66,13 @@ public class TransitionDrawable extends LayerDrawable implements Drawable.Callba
private boolean mReverse;
private long mStartTimeMillis;
private int mFrom;
@UnsupportedAppUsage
private int mTo;
private int mDuration;
private int mOriginalDuration;
@UnsupportedAppUsage
private int mAlpha = 0;
@UnsupportedAppUsage
private boolean mCrossFade;
/**

9
graphics/java/android/graphics/drawable/VectorDrawable.java
View File

@@ -16,6 +16,7 @@ package android.graphics.drawable;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.ComplexColor;
@@ -321,6 +322,7 @@ public class VectorDrawable extends Drawable {
private VectorDrawableState mVectorState;
@UnsupportedAppUsage
private PorterDuffColorFilter mTintFilter;
private ColorFilter mColorFilter;
@@ -389,6 +391,7 @@ public class VectorDrawable extends Drawable {
mMutated = false;
}
@UnsupportedAppUsage
Object getTargetByName(String name) {
return mVectorState.mVGTargetsMap.get(name);
}
@@ -868,6 +871,7 @@ public class VectorDrawable extends Drawable {
return super.getChangingConfigurations() | mVectorState.getChangingConfigurations();
}
@UnsupportedAppUsage
void setAllowCaching(boolean allowCaching) {
nSetAllowCaching(mVectorState.getNativeRenderer(), allowCaching);
}
@@ -1499,6 +1503,7 @@ public class VectorDrawable extends Drawable {
}
@SuppressWarnings("unused")
@UnsupportedAppUsage
public void setRotation(float rotation) {
if (isTreeValid()) {
nSetRotation(mNativePtr, rotation);
@@ -1511,6 +1516,7 @@ public class VectorDrawable extends Drawable {
}
@SuppressWarnings("unused")
@UnsupportedAppUsage
public void setPivotX(float pivotX) {
if (isTreeValid()) {
nSetPivotX(mNativePtr, pivotX);
@@ -1523,6 +1529,7 @@ public class VectorDrawable extends Drawable {
}
@SuppressWarnings("unused")
@UnsupportedAppUsage
public void setPivotY(float pivotY) {
if (isTreeValid()) {
nSetPivotY(mNativePtr, pivotY);
@@ -1559,6 +1566,7 @@ public class VectorDrawable extends Drawable {
}
@SuppressWarnings("unused")
@UnsupportedAppUsage
public void setTranslateX(float translateX) {
if (isTreeValid()) {
nSetTranslateX(mNativePtr, translateX);
@@ -1571,6 +1579,7 @@ public class VectorDrawable extends Drawable {
}
@SuppressWarnings("unused")
@UnsupportedAppUsage
public void setTranslateY(float translateY) {
if (isTreeValid()) {
nSetTranslateY(mNativePtr, translateY);

3
graphics/java/android/graphics/fonts/FontVariationAxis.java
View File

@@ -18,6 +18,7 @@ package android.graphics.fonts;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.text.TextUtils;
import java.util.ArrayList;
@@ -27,8 +28,10 @@ import java.util.regex.Pattern;
* Class that holds information about single font variation axis.
*/
public final class FontVariationAxis {
@UnsupportedAppUsage
private final int mTag;
private final String mTagString;
@UnsupportedAppUsage
private final float mStyleValue;
/**

3
graphics/java/android/graphics/pdf/PdfRenderer.java
View File

@@ -19,6 +19,7 @@ package android.graphics.pdf;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
import android.graphics.Matrix;
@@ -118,6 +119,7 @@ public final class PdfRenderer implements AutoCloseable {
private ParcelFileDescriptor mInput;
@UnsupportedAppUsage
private Page mCurrentPage;
/** @hide */
@@ -242,6 +244,7 @@ public final class PdfRenderer implements AutoCloseable {
}
}
@UnsupportedAppUsage
private void doClose() {
if (mCurrentPage != null) {
mCurrentPage.close();