diff options
116 files changed, 616 insertions, 434 deletions
diff --git a/Android.mk b/Android.mk index 88340e4369e9..32d9e9b07fe9 100644 --- a/Android.mk +++ b/Android.mk @@ -180,15 +180,17 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -hidePackage com.android.server # Convert an sdk level to a "since" argument. -since-arg = -since $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/$(1)/public/api/android.*) $(1) +since-arg = -since $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/$(1)/public/api/android.$(2)) $(1) -finalized_sdks := $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.xml,%,\ - $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.xml)) -finalized_sdks += $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,%,\ - $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt)) -finalized_sdks := $(call numerically_sort,$(finalized_sdks)) +finalized_xml_sdks := $(call numerically_sort,\ + $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.xml,%,\ + $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.xml))) +finalized_txt_sdks := $(call numerically_sort,\ + $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,%,\ + $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt))) -framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_sdks),$(call since-arg,$(sdk))) +framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_xml_sdks),$(call since-arg,$(sdk),xml)) +framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_txt_sdks),$(call since-arg,$(sdk),txt)) ifneq ($(PLATFORM_VERSION_CODENAME),REL) framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -since ./frameworks/base/api/current.txt $(PLATFORM_VERSION_CODENAME) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 6e0800c93b6b..de0cacbebb59 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1,6 +1,3 @@ -Landroid/accessibilityservice/AccessibilityService;->mInfo:Landroid/accessibilityservice/AccessibilityServiceInfo; -Landroid/accessibilityservice/AccessibilityService;->mWindowToken:Landroid/os/IBinder; -Landroid/accessibilityservice/AccessibilityServiceInfo;->setCapabilities(I)V Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;-><init>()V Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection; Landroid/accounts/Account;->accessId:Ljava/lang/String; @@ -51,13 +48,6 @@ Landroid/accounts/IAccountManagerResponse$Stub;-><init>()V Landroid/accounts/IAccountManagerResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManagerResponse; Landroid/accounts/IAccountManagerResponse;->onError(ILjava/lang/String;)V Landroid/accounts/IAccountManagerResponse;->onResult(Landroid/os/Bundle;)V -Landroid/animation/Animator;->reverse()V -Landroid/animation/ArgbEvaluator;->getInstance()Landroid/animation/ArgbEvaluator; -Landroid/animation/LayoutTransition;->cancel()V -Landroid/animation/LayoutTransition;->cancel(I)V -Landroid/animation/ValueAnimator;->animateValue(F)V -Landroid/animation/ValueAnimator;->mDuration:J -Landroid/animation/ValueAnimator;->sDurationScale:F Landroid/app/ActionBar;->collapseActionView()Z Landroid/app/ActionBar;->DISPLAY_TITLE_MULTIPLE_LINES:I Landroid/app/ActionBar;->setShowHideAnimationEnabled(Z)V @@ -1948,8 +1938,6 @@ Landroid/database/sqlite/SQLiteStatement;-><init>(Landroid/database/sqlite/SQLit Landroid/database/sqlite/SqliteWrapper;->checkSQLiteException(Landroid/content/Context;Landroid/database/sqlite/SQLiteException;)V Landroid/database/sqlite/SqliteWrapper;->delete(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I Landroid/database/sqlite/SqliteWrapper;->update(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I -Landroid/ddm/DdmHandleAppName;->getAppName()Ljava/lang/String; -Landroid/ddm/DdmHandleAppName;->setAppName(Ljava/lang/String;I)V Landroid/filterfw/core/Filter;-><init>(Ljava/lang/String;)V Landroid/filterfw/core/Filter;->isAvailable(Ljava/lang/String;)Z Landroid/filterfw/core/Filter;->setInputValue(Ljava/lang/String;Ljava/lang/Object;)V @@ -2016,224 +2004,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;->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;->dump()V Landroid/hardware/Camera$Parameters;->splitArea(Ljava/lang/String;)Ljava/util/ArrayList; @@ -3542,49 +3312,12 @@ Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/net/wifi/WifiSsid;->getOctets()[B Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String; Landroid/net/wifi/WifiSsid;->octets:Ljava/io/ByteArrayOutputStream; -Landroid/nfc/cardemulation/AidGroup;-><init>(Ljava/lang/String;Ljava/lang/String;)V -Landroid/nfc/cardemulation/AidGroup;->aids:Ljava/util/List; -Landroid/nfc/cardemulation/AidGroup;->category:Ljava/lang/String; -Landroid/nfc/cardemulation/AidGroup;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Landroid/nfc/cardemulation/AidGroup; -Landroid/nfc/cardemulation/AidGroup;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/nfc/cardemulation/AidGroup;->description:Ljava/lang/String; -Landroid/nfc/cardemulation/AidGroup;->getAids()Ljava/util/List; -Landroid/nfc/cardemulation/AidGroup;->getCategory()Ljava/lang/String; -Landroid/nfc/cardemulation/AidGroup;->writeAsXml(Lorg/xmlpull/v1/XmlSerializer;)V -Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/PackageManager;Landroid/content/pm/ResolveInfo;Z)V -Landroid/nfc/cardemulation/ApduServiceInfo;-><init>(Landroid/content/pm/ResolveInfo;ZLjava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;ZIILjava/lang/String;)V -Landroid/nfc/cardemulation/ApduServiceInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/nfc/cardemulation/ApduServiceInfo;->getDescription()Ljava/lang/String; -Landroid/nfc/cardemulation/ApduServiceInfo;->getSettingsActivityName()Ljava/lang/String; -Landroid/nfc/cardemulation/ApduServiceInfo;->getUid()I -Landroid/nfc/cardemulation/ApduServiceInfo;->isOnHost()Z -Landroid/nfc/cardemulation/ApduServiceInfo;->loadBanner(Landroid/content/pm/PackageManager;)Landroid/graphics/drawable/Drawable; -Landroid/nfc/cardemulation/ApduServiceInfo;->mDynamicAidGroups:Ljava/util/HashMap; -Landroid/nfc/cardemulation/ApduServiceInfo;->mService:Landroid/content/pm/ResolveInfo; -Landroid/nfc/cardemulation/ApduServiceInfo;->mStaticAidGroups:Ljava/util/HashMap; -Landroid/nfc/cardemulation/ApduServiceInfo;->requiresUnlock()Z -Landroid/nfc/ErrorCodes;->isError(I)Z Landroid/nfc/INfcAdapterExtras;->authenticate(Ljava/lang/String;[B)V Landroid/nfc/INfcAdapterExtras;->close(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle; Landroid/nfc/INfcAdapterExtras;->getCardEmulationRoute(Ljava/lang/String;)I Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle; Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle; -Landroid/nfc/NdefRecord;->mId:[B -Landroid/nfc/NfcActivityManager;->mAdapter:Landroid/nfc/NfcAdapter; -Landroid/nfc/NfcAdapter;->attemptDeadServiceRecovery(Ljava/lang/Exception;)V -Landroid/nfc/NfcAdapter;->getAdapterState()I -Landroid/nfc/NfcAdapter;->getContext()Landroid/content/Context; -Landroid/nfc/NfcAdapter;->getDefaultAdapter()Landroid/nfc/NfcAdapter; -Landroid/nfc/NfcAdapter;->getNfcAdapter(Landroid/content/Context;)Landroid/nfc/NfcAdapter; -Landroid/nfc/NfcAdapter;->getNfcAdapterExtrasInterface()Landroid/nfc/INfcAdapterExtras; -Landroid/nfc/NfcAdapter;->getService()Landroid/nfc/INfcAdapter; -Landroid/nfc/NfcAdapter;->setNdefPushMessageCallback(Landroid/nfc/NfcAdapter$CreateNdefMessageCallback;Landroid/app/Activity;I)V -Landroid/nfc/NfcAdapter;->sService:Landroid/nfc/INfcAdapter; -Landroid/nfc/NfcManager;-><init>(Landroid/content/Context;)V -Landroid/nfc/Tag;->getServiceHandle()I -Landroid/nfc/Tag;->getTagService()Landroid/nfc/INfcTag; -Landroid/nfc/Tag;->mId:[B Landroid/opengl/EGL14;->eglGetDisplay(J)Landroid/opengl/EGLDisplay; Landroid/opengl/GLES20;->glGetActiveAttrib(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V Landroid/opengl/GLES20;->glGetActiveUniform(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V @@ -4267,10 +4000,6 @@ Landroid/preference/VolumePreference$VolumeStore;->originalVolume:I Landroid/preference/VolumePreference$VolumeStore;->volume:I Landroid/preference/VolumePreference;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V Landroid/preference/VolumePreference;->mStreamType:I -Landroid/print/PrinterId;->getServiceName()Landroid/content/ComponentName; -Landroid/print/PrintJobInfo;->getAdvancedOptions()Landroid/os/Bundle; -Landroid/print/PrintJobInfo;->getDocumentInfo()Landroid/print/PrintDocumentInfo; -Landroid/print/PrintManager;->addPrintJobStateChangeListener(Landroid/print/PrintManager$PrintJobStateChangeListener;)V Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String; Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V Landroid/provider/BrowserContract$Accounts;->CONTENT_URI:Landroid/net/Uri; @@ -5639,21 +5368,6 @@ Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;-><init>()V Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;->mText:Ljava/lang/String; Landroid/view/ActionProvider;->reset()V Landroid/view/ActionProvider;->setSubUiVisibilityListener(Landroid/view/ActionProvider$SubUiVisibilityListener;)V -Landroid/view/animation/Animation;->detach()V -Landroid/view/animation/Animation;->getInvalidateRegion(IIIILandroid/graphics/RectF;Landroid/view/animation/Transformation;)V -Landroid/view/animation/Animation;->initializeInvalidateRegion(IIII)V -Landroid/view/animation/Animation;->mListener:Landroid/view/animation/Animation$AnimationListener; -Landroid/view/animation/Animation;->mPreviousRegion:Landroid/graphics/RectF; -Landroid/view/animation/Animation;->mPreviousTransformation:Landroid/view/animation/Transformation; -Landroid/view/animation/Animation;->mRegion:Landroid/graphics/RectF; -Landroid/view/animation/Animation;->mTransformation:Landroid/view/animation/Transformation; -Landroid/view/animation/AnimationUtils;->createAnimationFromXml(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/view/animation/AnimationSet;Landroid/util/AttributeSet;)Landroid/view/animation/Animation; -Landroid/view/animation/Transformation;->printShortString(Ljava/io/PrintWriter;)V -Landroid/view/animation/TranslateAnimation;->mFromXValue:F -Landroid/view/animation/TranslateAnimation;->mFromYValue:F -Landroid/view/animation/TranslateAnimation;->mToXValue:F -Landroid/view/animation/TranslateAnimation;->mToYValue:F -Landroid/view/animation/TranslateYAnimation;-><init>(IFIF)V Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/Choreographer$CallbackQueue;->addCallbackLocked(JLjava/lang/Object;Ljava/lang/Object;)V Landroid/view/Choreographer$CallbackRecord;->run(J)V @@ -7077,73 +6791,6 @@ Lcom/android/ims/internal/IImsVideoCallCallback;->receiveSessionModifyRequest(La Lcom/android/ims/internal/IImsVideoCallCallback;->receiveSessionModifyResponse(ILandroid/telecom/VideoProfile;Landroid/telecom/VideoProfile;)V Lcom/android/ims/internal/IImsVideoCallProvider$Stub;-><init>()V Lcom/android/ims/internal/IImsVideoCallProvider;->setCallback(Lcom/android/ims/internal/IImsVideoCallCallback;)V -Lcom/android/ims/internal/uce/common/CapInfo;-><init>()V -Lcom/android/ims/internal/uce/common/CapInfo;->setCapTimestamp(J)V -Lcom/android/ims/internal/uce/common/CapInfo;->setCdViaPresenceSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setExts([Ljava/lang/String;)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtHttpSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtSnFSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtThumbSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFullSnFGroupChatSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullFtSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPushSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setImSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIpVideoSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIpVoiceSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIsSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoOnlyCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVoiceCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setSmSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setSpSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setVsDuringCSSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setVsSupported(Z)V -Lcom/android/ims/internal/uce/common/StatusCode;-><init>()V -Lcom/android/ims/internal/uce/common/StatusCode;->setStatusCode(I)V -Lcom/android/ims/internal/uce/common/UceLong;->getUceLong()J -Lcom/android/ims/internal/uce/common/UceLong;->setUceLong(J)V -Lcom/android/ims/internal/uce/presence/PresCmdId;-><init>()V -Lcom/android/ims/internal/uce/presence/PresCmdId;->setCmdId(I)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;-><init>()V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setUserData(I)V -Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;-><init>()V -Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;->setPublishTrigeerType(I)V -Lcom/android/ims/internal/uce/presence/PresResInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setDisplayName(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setInstanceInfo(Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;)V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setResUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setPresentityUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setReason(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResId(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResInstanceState(I)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setTupleInfo([Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setFullState(Z)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setListName(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setPresSubscriptionState(Lcom/android/ims/internal/uce/presence/PresSubscriptionState;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionExpireTime(I)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionTerminatedReason(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setVersion(I)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;-><init>()V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setReasonPhrase(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRetryAfter(I)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setSipResponseCode(I)V -Lcom/android/ims/internal/uce/presence/PresSubscriptionState;-><init>()V -Lcom/android/ims/internal/uce/presence/PresSubscriptionState;->setPresSubscriptionState(I)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setContactUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setFeatureTag(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setTimestamp(Ljava/lang/String;)V Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V Lcom/android/internal/app/AlertController$AlertParams;-><init>(Landroid/content/Context;)V Lcom/android/internal/app/AlertController$AlertParams;->apply(Lcom/android/internal/app/AlertController;)V diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt index 781f6e63fc24..a4fc30dfe679 100644 --- a/config/hiddenapi-vendor-list.txt +++ b/config/hiddenapi-vendor-list.txt @@ -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/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; @@ -362,8 +358,6 @@ Landroid/os/SystemVibrator;-><init>()V Landroid/os/UserHandle;->isSameApp(II)Z Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z Landroid/os/UserManager;->isAdminUser()Z -Landroid/print/PrintDocumentAdapter$LayoutResultCallback;-><init>()V -Landroid/print/PrintDocumentAdapter$WriteResultCallback;-><init>()V Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String; Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence; Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String; @@ -571,31 +565,6 @@ Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueried(Lcom/android/i Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueryFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdated(Lcom/android/ims/internal/IImsUt;I)V Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdateFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/uce/common/CapInfo;->getCapTimestamp()J -Lcom/android/ims/internal/uce/common/CapInfo;->isCdViaPresenceSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtHttpSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtSnFSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtThumbSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFullSnFGroupChatSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullFtSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPushSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isImSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIpVideoSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIpVoiceSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIsSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoOnlyCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVoiceCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isSmSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isSpSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isVsDuringCSSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isVsSupported()Z -Lcom/android/ims/internal/uce/common/StatusCode;->getStatusCode()I -Lcom/android/ims/internal/uce/common/UceLong;-><init>()V -Lcom/android/ims/internal/uce/common/UceLong;->getClientId()I -Lcom/android/ims/internal/uce/common/UceLong;->setClientId(I)V Lcom/android/ims/internal/uce/options/IOptionsListener;->cmdStatus(Lcom/android/ims/internal/uce/options/OptionsCmdStatus;)V Lcom/android/ims/internal/uce/options/IOptionsListener;->getVersionCb(Ljava/lang/String;)V Lcom/android/ims/internal/uce/options/IOptionsListener;->incomingOptions(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;I)V @@ -611,24 +580,6 @@ Lcom/android/ims/internal/uce/options/IOptionsService;->getVersion(I)Lcom/androi Lcom/android/ims/internal/uce/options/IOptionsService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; Lcom/android/ims/internal/uce/options/IOptionsService;->responseIncomingOptions(IIILjava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;Z)Lcom/android/ims/internal/uce/common/StatusCode; Lcom/android/ims/internal/uce/options/IOptionsService;->setMyInfo(ILcom/android/ims/internal/uce/common/CapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getSdp()Ljava/lang/String; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setSdp(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/options/OptionsCmdId;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCmdId;->setCmdId(I)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setUserData(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setReasonPhrase(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRequestId(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRetryAfter(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setSipResponseCode(I)V Lcom/android/ims/internal/uce/presence/IPresenceListener;->capInfoReceived(Ljava/lang/String;[Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V Lcom/android/ims/internal/uce/presence/IPresenceListener;->cmdStatus(Lcom/android/ims/internal/uce/presence/PresCmdStatus;)V Lcom/android/ims/internal/uce/presence/IPresenceListener;->getVersionCb(Ljava/lang/String;)V @@ -647,18 +598,6 @@ Lcom/android/ims/internal/uce/presence/IPresenceService;->publishMyCap(ILcom/and Lcom/android/ims/internal/uce/presence/IPresenceService;->reenableService(II)Lcom/android/ims/internal/uce/common/StatusCode; Lcom/android/ims/internal/uce/presence/IPresenceService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; Lcom/android/ims/internal/uce/presence/IPresenceService;->setNewFeatureTag(ILjava/lang/String;Lcom/android/ims/internal/uce/presence/PresServiceInfo;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->getContactUri()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->mContactUri:Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getMediaType()I -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceDesc()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceId()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceVer()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getCmdId()Lcom/android/ims/internal/uce/presence/PresCmdId; -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getReasonPhrase()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRequestId()I -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRetryAfter()I -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getSipResponseCode()I Lcom/android/ims/internal/uce/uceservice/IUceListener;->setStatus(I)V Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V Lcom/android/ims/internal/uce/uceservice/IUceService;->createOptionsService(Lcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)I diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index a558d6850af1..5a25450e516a 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -21,6 +21,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; +import android.annotation.UnsupportedAppUsage; import android.app.Service; import android.content.Context; import android.content.Intent; @@ -393,8 +394,10 @@ public abstract class AccessibilityService extends Service { private int mConnectionId = AccessibilityInteractionClient.NO_ID; + @UnsupportedAppUsage private AccessibilityServiceInfo mInfo; + @UnsupportedAppUsage private IBinder mWindowToken; private WindowManager mWindowManager; diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 06a9b0676d08..f41fea1d317f 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -16,6 +16,7 @@ package android.accessibilityservice; +import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; @@ -660,6 +661,7 @@ public class AccessibilityServiceInfo implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void setCapabilities(int capabilities) { mCapabilities = capabilities; } diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index 4ebcc446e5a2..17d54d2455fe 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -17,6 +17,7 @@ package android.animation; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ConstantState; @@ -460,6 +461,7 @@ public abstract class Animator implements Cloneable { /** * @hide */ + @UnsupportedAppUsage public void reverse() { throw new IllegalStateException("Reverse is not supported"); } diff --git a/core/java/android/animation/ArgbEvaluator.java b/core/java/android/animation/ArgbEvaluator.java index a96bee6ac203..5b69d18a8386 100644 --- a/core/java/android/animation/ArgbEvaluator.java +++ b/core/java/android/animation/ArgbEvaluator.java @@ -16,6 +16,8 @@ package android.animation; +import android.annotation.UnsupportedAppUsage; + /** * This evaluator can be used to perform type interpolation between integer * values that represent ARGB colors. @@ -31,6 +33,7 @@ public class ArgbEvaluator implements TypeEvaluator { * * @hide */ + @UnsupportedAppUsage public static ArgbEvaluator getInstance() { return sInstance; } diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java index 5a23fddf1d51..5b3813d9c3af 100644 --- a/core/java/android/animation/LayoutTransition.java +++ b/core/java/android/animation/LayoutTransition.java @@ -16,6 +16,7 @@ package android.animation; +import android.annotation.UnsupportedAppUsage; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; @@ -1070,6 +1071,7 @@ public class LayoutTransition { * * @hide */ + @UnsupportedAppUsage public void cancel() { if (currentChangingAnimations.size() > 0) { LinkedHashMap<View, Animator> currentAnimCopy = @@ -1105,6 +1107,7 @@ public class LayoutTransition { * * @hide */ + @UnsupportedAppUsage public void cancel(int transitionType) { switch (transitionType) { case CHANGE_APPEARING: diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index ee89ca8d55e2..3af7b95ad385 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -19,6 +19,7 @@ package android.animation; import android.annotation.CallSuper; import android.annotation.IntDef; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.os.Looper; import android.os.Trace; import android.util.AndroidRuntimeException; @@ -75,6 +76,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio /** * Internal constants */ + @UnsupportedAppUsage private static float sDurationScale = 1.0f; /** @@ -200,6 +202,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio // // How long the animation should last in ms + @UnsupportedAppUsage private long mDuration = 300; // The amount of time in ms to delay starting the animation after start() is called. Note @@ -1509,6 +1512,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio * @param fraction The elapsed fraction of the animation. */ @CallSuper + @UnsupportedAppUsage void animateValue(float fraction) { fraction = mInterpolator.getInterpolation(fraction); mCurrentFraction = fraction; diff --git a/core/java/android/ddm/DdmHandleAppName.java b/core/java/android/ddm/DdmHandleAppName.java index 7e39e47cb952..956078772ca8 100644 --- a/core/java/android/ddm/DdmHandleAppName.java +++ b/core/java/android/ddm/DdmHandleAppName.java @@ -16,6 +16,7 @@ package android.ddm; +import android.annotation.UnsupportedAppUsage; import org.apache.harmony.dalvik.ddmc.Chunk; import org.apache.harmony.dalvik.ddmc.ChunkHandler; import org.apache.harmony.dalvik.ddmc.DdmServer; @@ -69,6 +70,7 @@ public class DdmHandleAppName extends ChunkHandler { * before or after DDMS connects. For the latter we need to send up * an APNM message. */ + @UnsupportedAppUsage public static void setAppName(String name, int userId) { if (name == null || name.length() == 0) return; @@ -79,6 +81,7 @@ public class DdmHandleAppName extends ChunkHandler { sendAPNM(name, userId); } + @UnsupportedAppUsage public static String getAppName() { return mAppName; } diff --git a/core/java/android/nfc/ErrorCodes.java b/core/java/android/nfc/ErrorCodes.java index 3adcdc378b77..98e31ad53be3 100644 --- a/core/java/android/nfc/ErrorCodes.java +++ b/core/java/android/nfc/ErrorCodes.java @@ -16,6 +16,8 @@ package android.nfc; +import android.annotation.UnsupportedAppUsage; + /** * This class defines all the error codes that can be returned by the service * and producing an exception on the application level. These are needed since @@ -25,6 +27,7 @@ package android.nfc; */ public class ErrorCodes { + @UnsupportedAppUsage public static boolean isError(int code) { if (code < 0) { return true; diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 093a9b469cb8..b0090ca6bc32 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -16,6 +16,7 @@ package android.nfc; +import android.annotation.UnsupportedAppUsage; import android.content.Intent; import android.net.Uri; import android.os.Parcel; @@ -279,6 +280,7 @@ public final class NdefRecord implements Parcelable { private final short mTnf; private final byte[] mType; + @UnsupportedAppUsage private final byte[] mId; private final byte[] mPayload; diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java index c7d4c65d99c0..87e644f7f8d0 100644 --- a/core/java/android/nfc/NfcActivityManager.java +++ b/core/java/android/nfc/NfcActivityManager.java @@ -16,6 +16,7 @@ package android.nfc; +import android.annotation.UnsupportedAppUsage; import android.app.Activity; import android.app.Application; import android.content.ContentProvider; @@ -45,6 +46,7 @@ public final class NfcActivityManager extends IAppCallback.Stub static final String TAG = NfcAdapter.TAG; static final Boolean DBG = false; + @UnsupportedAppUsage final NfcAdapter mAdapter; // All objects in the lists are protected by this diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index c3f23a1cca9f..21fed48189eb 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -20,6 +20,7 @@ import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.app.Activity; import android.app.ActivityThread; import android.app.OnActivityPausedListener; @@ -325,6 +326,7 @@ public final class NfcAdapter { // Final after first constructor, except for // attemptDeadServiceRecovery() when NFC crashes - we accept a best effort // recovery + @UnsupportedAppUsage static INfcAdapter sService; static INfcTag sTagService; static INfcCardEmulation sCardEmulationService; @@ -490,6 +492,7 @@ public final class NfcAdapter { * or throws if NFC is not available. * @hide */ + @UnsupportedAppUsage public static synchronized NfcAdapter getNfcAdapter(Context context) { if (!sIsInitialized) { sHasNfcFeature = hasNfcFeature(); @@ -593,6 +596,7 @@ public final class NfcAdapter { * @hide */ @Deprecated + @UnsupportedAppUsage public static NfcAdapter getDefaultAdapter() { // introduced in API version 9 (GB 2.3) // deprecated in API version 10 (GB 2.3.3) @@ -615,6 +619,7 @@ public final class NfcAdapter { /** * @hide */ + @UnsupportedAppUsage public Context getContext() { return mContext; } @@ -623,6 +628,7 @@ public final class NfcAdapter { * Returns the binder interface to the service. * @hide */ + @UnsupportedAppUsage public INfcAdapter getService() { isEnabled(); // NOP call to recover sService if it is stale return sService; @@ -676,6 +682,7 @@ public final class NfcAdapter { * NFC service dead - attempt best effort recovery * @hide */ + @UnsupportedAppUsage public void attemptDeadServiceRecovery(Exception e) { Log.e(TAG, "NFC service dead - attempting to recover", e); INfcAdapter service = getServiceInterface(); @@ -746,6 +753,7 @@ public final class NfcAdapter { * * @hide */ + @UnsupportedAppUsage public int getAdapterState() { try { return sService.getState(); @@ -1227,6 +1235,7 @@ public final class NfcAdapter { /** * @hide */ + @UnsupportedAppUsage public void setNdefPushMessageCallback(CreateNdefMessageCallback callback, Activity activity, int flags) { if (activity == null) { @@ -1862,6 +1871,7 @@ public final class NfcAdapter { /** * @hide */ + @UnsupportedAppUsage public INfcAdapterExtras getNfcAdapterExtrasInterface() { if (mContext == null) { throw new UnsupportedOperationException("You need a context on NfcAdapter to use the " diff --git a/core/java/android/nfc/NfcManager.java b/core/java/android/nfc/NfcManager.java index 50d674570c14..71199c9c6257 100644 --- a/core/java/android/nfc/NfcManager.java +++ b/core/java/android/nfc/NfcManager.java @@ -17,6 +17,7 @@ package android.nfc; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; /** @@ -44,6 +45,7 @@ public final class NfcManager { /** * @hide */ + @UnsupportedAppUsage public NfcManager(Context context) { NfcAdapter adapter; context = context.getApplicationContext(); diff --git a/core/java/android/nfc/Tag.java b/core/java/android/nfc/Tag.java index 154d5a11db9e..ce684cfea180 100644 --- a/core/java/android/nfc/Tag.java +++ b/core/java/android/nfc/Tag.java @@ -16,6 +16,7 @@ package android.nfc; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.nfc.tech.IsoDep; import android.nfc.tech.MifareClassic; @@ -110,6 +111,7 @@ import java.util.HashMap; * <p> */ public final class Tag implements Parcelable { + @UnsupportedAppUsage final byte[] mId; final int[] mTechList; final String[] mTechStringList; @@ -235,6 +237,7 @@ public final class Tag implements Parcelable { * For use by NfcService only. * @hide */ + @UnsupportedAppUsage public int getServiceHandle() { return mServiceHandle; } @@ -355,6 +358,7 @@ public final class Tag implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public INfcTag getTagService() { return mTagService; } diff --git a/core/java/android/nfc/cardemulation/AidGroup.java b/core/java/android/nfc/cardemulation/AidGroup.java index 78a9401a2abd..63776c4f397a 100644 --- a/core/java/android/nfc/cardemulation/AidGroup.java +++ b/core/java/android/nfc/cardemulation/AidGroup.java @@ -24,6 +24,7 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -45,8 +46,11 @@ public final class AidGroup implements Parcelable { static final String TAG = "AidGroup"; + @UnsupportedAppUsage final List<String> aids; + @UnsupportedAppUsage final String category; + @UnsupportedAppUsage final String description; /** @@ -79,6 +83,7 @@ public final class AidGroup implements Parcelable { this.description = null; } + @UnsupportedAppUsage AidGroup(String category, String description) { this.aids = new ArrayList<String>(); this.category = category; @@ -88,6 +93,7 @@ public final class AidGroup implements Parcelable { /** * @return the category of this AID group */ + @UnsupportedAppUsage public String getCategory() { return category; } @@ -95,6 +101,7 @@ public final class AidGroup implements Parcelable { /** * @return the list of AIDs in this group */ + @UnsupportedAppUsage public List<String> getAids() { return aids; } @@ -124,6 +131,7 @@ public final class AidGroup implements Parcelable { } } + @UnsupportedAppUsage public static final Parcelable.Creator<AidGroup> CREATOR = new Parcelable.Creator<AidGroup>() { @@ -144,6 +152,7 @@ public final class AidGroup implements Parcelable { } }; + @UnsupportedAppUsage static public AidGroup createFromXml(XmlPullParser parser) throws XmlPullParserException, IOException { String category = null; ArrayList<String> aids = new ArrayList<String>(); @@ -185,6 +194,7 @@ public final class AidGroup implements Parcelable { return group; } + @UnsupportedAppUsage public void writeAsXml(XmlSerializer out) throws IOException { out.startTag(null, "aid-group"); out.attribute(null, "category", category); diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index 218e4f223549..e8d801c525e9 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -16,6 +16,7 @@ package android.nfc.cardemulation; +import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; @@ -54,6 +55,7 @@ public final class ApduServiceInfo implements Parcelable { /** * The service that implements this */ + @UnsupportedAppUsage final ResolveInfo mService; /** @@ -69,11 +71,13 @@ public final class ApduServiceInfo implements Parcelable { /** * Mapping from category to static AID group */ + @UnsupportedAppUsage final HashMap<String, AidGroup> mStaticAidGroups; /** * Mapping from category to dynamic AID group */ + @UnsupportedAppUsage final HashMap<String, AidGroup> mDynamicAidGroups; /** @@ -99,6 +103,7 @@ public final class ApduServiceInfo implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public ApduServiceInfo(ResolveInfo info, boolean onHost, String description, ArrayList<AidGroup> staticAidGroups, ArrayList<AidGroup> dynamicAidGroups, boolean requiresUnlock, int bannerResource, int uid, @@ -120,6 +125,7 @@ public final class ApduServiceInfo implements Parcelable { this.mSettingsActivityName = settingsActivityName; } + @UnsupportedAppUsage public ApduServiceInfo(PackageManager pm, ResolveInfo info, boolean onHost) throws XmlPullParserException, IOException { ServiceInfo si = info.serviceInfo; @@ -374,18 +380,22 @@ public final class ApduServiceInfo implements Parcelable { return (mStaticAidGroups.containsKey(category) || mDynamicAidGroups.containsKey(category)); } + @UnsupportedAppUsage public boolean isOnHost() { return mOnHost; } + @UnsupportedAppUsage public boolean requiresUnlock() { return mRequiresDeviceUnlock; } + @UnsupportedAppUsage public String getDescription() { return mDescription; } + @UnsupportedAppUsage public int getUid() { return mUid; } @@ -411,6 +421,7 @@ public final class ApduServiceInfo implements Parcelable { return mService.loadIcon(pm); } + @UnsupportedAppUsage public Drawable loadBanner(PackageManager pm) { Resources res; try { @@ -426,6 +437,7 @@ public final class ApduServiceInfo implements Parcelable { } } + @UnsupportedAppUsage public String getSettingsActivityName() { return mSettingsActivityName; } @Override @@ -483,6 +495,7 @@ public final class ApduServiceInfo implements Parcelable { dest.writeString(mSettingsActivityName); }; + @UnsupportedAppUsage public static final Parcelable.Creator<ApduServiceInfo> CREATOR = new Parcelable.Creator<ApduServiceInfo>() { @Override diff --git a/core/java/android/print/PrintDocumentAdapter.java b/core/java/android/print/PrintDocumentAdapter.java index 2bb7c2e5f1c3..d1b6efc70a2a 100644 --- a/core/java/android/print/PrintDocumentAdapter.java +++ b/core/java/android/print/PrintDocumentAdapter.java @@ -16,6 +16,7 @@ package android.print; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.CancellationSignal; import android.os.ParcelFileDescriptor; @@ -260,6 +261,7 @@ public abstract class PrintDocumentAdapter { /** * @hide */ + @UnsupportedAppUsage public WriteResultCallback() { /* do nothing - hide constructor */ } @@ -304,6 +306,7 @@ public abstract class PrintDocumentAdapter { /** * @hide */ + @UnsupportedAppUsage public LayoutResultCallback() { /* do nothing - hide constructor */ } diff --git a/core/java/android/print/PrintJobInfo.java b/core/java/android/print/PrintJobInfo.java index 3d094f7d09f4..5ebc1897da22 100644 --- a/core/java/android/print/PrintJobInfo.java +++ b/core/java/android/print/PrintJobInfo.java @@ -23,6 +23,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringRes; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; @@ -543,6 +544,7 @@ public final class PrintJobInfo implements Parcelable { * * @hide */ + @UnsupportedAppUsage public PrintDocumentInfo getDocumentInfo() { return mDocumentInfo; } @@ -624,6 +626,7 @@ public final class PrintJobInfo implements Parcelable { * * @hide */ + @UnsupportedAppUsage public Bundle getAdvancedOptions() { return mAdvancedOptions; } diff --git a/core/java/android/print/PrintManager.java b/core/java/android/print/PrintManager.java index 51b77980fcf4..9a0bc4ca215c 100644 --- a/core/java/android/print/PrintManager.java +++ b/core/java/android/print/PrintManager.java @@ -21,6 +21,7 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.app.Activity; import android.app.Application.ActivityLifecycleCallbacks; import android.content.ComponentName; @@ -308,6 +309,7 @@ public final class PrintManager { * @param listener The listener to add. * @hide */ + @UnsupportedAppUsage public void addPrintJobStateChangeListener(PrintJobStateChangeListener listener) { if (mService == null) { Log.w(LOG_TAG, "Feature android.software.print not available"); diff --git a/core/java/android/print/PrinterId.java b/core/java/android/print/PrinterId.java index ff9c0df58f91..659e56f19c79 100644 --- a/core/java/android/print/PrinterId.java +++ b/core/java/android/print/PrinterId.java @@ -17,6 +17,7 @@ package android.print; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; @@ -57,6 +58,7 @@ public final class PrinterId implements Parcelable { * * @hide */ + @UnsupportedAppUsage public @NonNull ComponentName getServiceName() { return mServiceName; } diff --git a/core/java/android/util/Log.java b/core/java/android/util/Log.java index 029986534890..7305f85469d8 100644 --- a/core/java/android/util/Log.java +++ b/core/java/android/util/Log.java @@ -370,8 +370,8 @@ public final class Log { /** @hide */ public static final int LOG_ID_SYSTEM = 3; /** @hide */ public static final int LOG_ID_CRASH = 4; - /** @hide */ public static native int println_native(int bufID, - int priority, String tag, String msg); + /** @hide */ + public static native int println_native(int bufID, int priority, String tag, String msg); /** * Return the maximum payload the log daemon accepts without truncation. diff --git a/core/java/android/view/animation/Animation.java b/core/java/android/view/animation/Animation.java index 474db128fcc3..b464c34f164a 100644 --- a/core/java/android/view/animation/Animation.java +++ b/core/java/android/view/animation/Animation.java @@ -19,6 +19,7 @@ package android.view.animation; import android.annotation.AnimRes; import android.annotation.ColorInt; import android.annotation.InterpolatorRes; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.RectF; @@ -183,6 +184,7 @@ public abstract class Animation implements Cloneable { /** * The animation listener to be notified when the animation starts, ends or repeats. */ + @UnsupportedAppUsage AnimationListener mListener; /** @@ -209,9 +211,13 @@ public abstract class Animation implements Cloneable { private boolean mMore = true; private boolean mOneMoreTime = true; + @UnsupportedAppUsage RectF mPreviousRegion = new RectF(); + @UnsupportedAppUsage RectF mRegion = new RectF(); + @UnsupportedAppUsage Transformation mTransformation = new Transformation(); + @UnsupportedAppUsage Transformation mPreviousTransformation = new Transformation(); private final CloseGuard guard = CloseGuard.get(); @@ -317,6 +323,7 @@ public abstract class Animation implements Cloneable { /** * @hide */ + @UnsupportedAppUsage public void detach() { if (mStarted && !mEnded) { mEnded = true; @@ -1019,6 +1026,7 @@ public abstract class Animation implements Cloneable { * * @hide */ + @UnsupportedAppUsage public void getInvalidateRegion(int left, int top, int right, int bottom, RectF invalidate, Transformation transformation) { @@ -1050,6 +1058,7 @@ public abstract class Animation implements Cloneable { * * @hide */ + @UnsupportedAppUsage public void initializeInvalidateRegion(int left, int top, int right, int bottom) { final RectF region = mPreviousRegion; region.set(left, top, right, bottom); diff --git a/core/java/android/view/animation/AnimationUtils.java b/core/java/android/view/animation/AnimationUtils.java index f5c36139df0f..6ab65c372850 100644 --- a/core/java/android/view/animation/AnimationUtils.java +++ b/core/java/android/view/animation/AnimationUtils.java @@ -18,6 +18,7 @@ package android.view.animation; import android.annotation.AnimRes; import android.annotation.InterpolatorRes; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; @@ -127,6 +128,7 @@ public class AnimationUtils { return createAnimationFromXml(c, parser, null, Xml.asAttributeSet(parser)); } + @UnsupportedAppUsage private static Animation createAnimationFromXml(Context c, XmlPullParser parser, AnimationSet parent, AttributeSet attrs) throws XmlPullParserException, IOException { diff --git a/core/java/android/view/animation/Transformation.java b/core/java/android/view/animation/Transformation.java index 8eb5b5cf5441..58da04d8d38f 100644 --- a/core/java/android/view/animation/Transformation.java +++ b/core/java/android/view/animation/Transformation.java @@ -17,6 +17,7 @@ package android.view.animation; import android.annotation.FloatRange; +import android.annotation.UnsupportedAppUsage; import android.graphics.Matrix; import android.graphics.Rect; @@ -238,6 +239,7 @@ public class Transformation { * Print short string, to optimize dumping. * @hide */ + @UnsupportedAppUsage public void printShortString(PrintWriter pw) { pw.print("{alpha="); pw.print(mAlpha); pw.print(" matrix="); diff --git a/core/java/android/view/animation/TranslateAnimation.java b/core/java/android/view/animation/TranslateAnimation.java index 216022b24eb6..6c040d4c61aa 100644 --- a/core/java/android/view/animation/TranslateAnimation.java +++ b/core/java/android/view/animation/TranslateAnimation.java @@ -16,6 +16,7 @@ package android.view.animation; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -34,13 +35,17 @@ public class TranslateAnimation extends Animation { private int mToYType = ABSOLUTE; /** @hide */ + @UnsupportedAppUsage protected float mFromXValue = 0.0f; /** @hide */ + @UnsupportedAppUsage protected float mToXValue = 0.0f; /** @hide */ + @UnsupportedAppUsage protected float mFromYValue = 0.0f; /** @hide */ + @UnsupportedAppUsage protected float mToYValue = 0.0f; /** @hide */ diff --git a/core/java/android/view/animation/TranslateYAnimation.java b/core/java/android/view/animation/TranslateYAnimation.java index 714558dc717d..a6e0ccb18805 100644 --- a/core/java/android/view/animation/TranslateYAnimation.java +++ b/core/java/android/view/animation/TranslateYAnimation.java @@ -16,6 +16,7 @@ package android.view.animation; +import android.annotation.UnsupportedAppUsage; import android.graphics.Matrix; /** @@ -38,6 +39,7 @@ public class TranslateYAnimation extends TranslateAnimation { /** * Constructor. Passes in 0 for the x parameters of TranslateAnimation */ + @UnsupportedAppUsage public TranslateYAnimation(int fromYType, float fromYValue, int toYType, float toYValue) { super(ABSOLUTE, 0, ABSOLUTE, 0, fromYType, fromYValue, toYType, toYValue); } diff --git a/graphics/java/android/graphics/BaseCanvas.java b/graphics/java/android/graphics/BaseCanvas.java index 1f339f7aaa54..d299ed8e9b76 100644 --- a/graphics/java/android/graphics/BaseCanvas.java +++ b/graphics/java/android/graphics/BaseCanvas.java @@ -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.SpannableString; @@ -41,6 +42,7 @@ public abstract class BaseCanvas { * Should only be assigned in constructors (or setBitmap if software canvas), * freed by NativeAllocation. */ + @UnsupportedAppUsage protected long mNativeCanvasWrapper; /** diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 57c75490ec47..c2d6c55c7e9a 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -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.content.res.ResourcesImpl; import android.os.Parcel; import android.os.Parcelable; @@ -52,6 +53,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; @@ -70,9 +72,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; @@ -94,11 +100,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; @@ -155,6 +163,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; @@ -325,6 +334,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void setNinePatchChunk(byte[] chunk) { mNinePatchChunk = chunk; } @@ -510,6 +520,7 @@ public final class Bitmap implements Parcelable { */ HARDWARE (7); + @UnsupportedAppUsage final int nativeInt; private static Config sConfigs[] = { @@ -520,6 +531,7 @@ public final class Bitmap implements Parcelable { this.nativeInt = ni; } + @UnsupportedAppUsage static Config nativeToConfig(int ni) { return sConfigs[ni]; } @@ -654,6 +666,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public Bitmap createAshmemBitmap() { checkRecycled("Can't copy a recycled bitmap"); noteHardwareBitmapSlowCall(); @@ -672,6 +685,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public Bitmap createAshmemBitmap(Config config) { checkRecycled("Can't copy a recycled bitmap"); noteHardwareBitmapSlowCall(); @@ -690,6 +704,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); } @@ -1390,6 +1405,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; @@ -1920,6 +1936,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); } @@ -1937,6 +1954,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); diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index ffb39e339119..2d0be50364eb 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -18,6 +18,7 @@ package android.graphics; import static android.graphics.BitmapFactory.Options.validate; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; import android.os.Trace; @@ -822,11 +823,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); diff --git a/graphics/java/android/graphics/BitmapRegionDecoder.java b/graphics/java/android/graphics/BitmapRegionDecoder.java index 2da27c7dfdbf..9b5027d71ad6 100644 --- a/graphics/java/android/graphics/BitmapRegionDecoder.java +++ b/graphics/java/android/graphics/BitmapRegionDecoder.java @@ -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( diff --git a/graphics/java/android/graphics/BitmapShader.java b/graphics/java/android/graphics/BitmapShader.java index 5577f53ee28b..bcf72298ba30 100644 --- a/graphics/java/android/graphics/BitmapShader.java +++ b/graphics/java/android/graphics/BitmapShader.java @@ -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; /** diff --git a/graphics/java/android/graphics/Camera.java b/graphics/java/android/graphics/Camera.java index 60588d07196c..33889410a54b 100644 --- a/graphics/java/android/graphics/Camera.java +++ b/graphics/java/android/graphics/Camera.java @@ -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; } diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 0301f2e6b555..c408e738586e 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -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; @@ -53,6 +54,7 @@ public class Canvas extends BaseCanvas { public static boolean sCompatibilitySetBitmap = false; /** @hide */ + @UnsupportedAppUsage public long getNativeCanvasWrapper() { return mNativeCanvasWrapper; } @@ -61,6 +63,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 @@ -122,6 +125,7 @@ public class Canvas extends BaseCanvas { } /** @hide */ + @UnsupportedAppUsage public Canvas(long nativeCanvas) { if (nativeCanvas == 0) { throw new IllegalStateException(); @@ -140,6 +144,7 @@ public class Canvas extends BaseCanvas { * @hide */ @Deprecated + @UnsupportedAppUsage protected GL getGL() { return null; } @@ -273,6 +278,7 @@ public class Canvas extends BaseCanvas { } /** @hide */ + @UnsupportedAppUsage public void setScreenDensity(int density) { mScreenDensity = density; } @@ -1198,6 +1204,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1211,6 +1218,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public static void freeCaches() { nFreeCaches(); } @@ -1220,6 +1228,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index ea3886cde274..1275e0827580 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -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())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index 9201a2e2310e..01911359a1e3 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -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) { diff --git a/graphics/java/android/graphics/FontFamily.java b/graphics/java/android/graphics/FontFamily.java index d9a77e752823..14f4ac24cff4 100644 --- a/graphics/java/android/graphics/FontFamily.java +++ b/graphics/java/android/graphics/FontFamily.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.graphics.fonts.FontVariationAxis; import android.text.FontConfig; @@ -44,6 +45,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); } @@ -58,6 +60,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"); @@ -67,6 +70,7 @@ public class FontFamily { return mNativePtr != 0; } + @UnsupportedAppUsage public void abortCreation() { if (mBuilderPtr == 0) { throw new IllegalStateException("This FontFamily is already frozen or abandoned"); @@ -110,6 +114,7 @@ public class FontFamily { } } + @UnsupportedAppUsage public boolean addFontFromBuffer(ByteBuffer font, int ttcIndex, FontVariationAxis[] axes, int weight, int italic) { if (mBuilderPtr == 0) { @@ -135,6 +140,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) { diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index 53d21776eed7..74086830fae2 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -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) { diff --git a/graphics/java/android/graphics/ImageFormat.java b/graphics/java/android/graphics/ImageFormat.java index 43fd2708ee3e..9546a4aec330 100644 --- a/graphics/java/android/graphics/ImageFormat.java +++ b/graphics/java/android/graphics/ImageFormat.java @@ -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; /** diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index 1578ffb873f0..62a890ff4f0b 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -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; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index 7139efec9337..7e6fc353cf1e 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -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; /** diff --git a/graphics/java/android/graphics/Matrix.java b/graphics/java/android/graphics/Matrix.java index 486070c99e3f..f8cb366c7b92 100644 --- a/graphics/java/android/graphics/Matrix.java +++ b/graphics/java/android/graphics/Matrix.java @@ -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; /** diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index c8f86c607132..32be6b368858 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -16,13 +16,16 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import java.io.InputStream; import java.io.FileInputStream; public class Movie { + @UnsupportedAppUsage private long mNativeMovie; + @UnsupportedAppUsage private Movie(long nativeMovie) { if (nativeMovie == 0) { throw new RuntimeException("native movie creation failed"); diff --git a/graphics/java/android/graphics/NinePatch.java b/graphics/java/android/graphics/NinePatch.java index b6a209f25df9..800247af4927 100644 --- a/graphics/java/android/graphics/NinePatch.java +++ b/graphics/java/android/graphics/NinePatch.java @@ -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; diff --git a/graphics/java/android/graphics/Outline.java b/graphics/java/android/graphics/Outline.java index 1c85df0de590..98c990a71601 100644 --- a/graphics/java/android/graphics/Outline.java +++ b/graphics/java/android/graphics/Outline.java @@ -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; diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index aa9227c9bb08..94fde27631f9 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -19,6 +19,7 @@ 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; @@ -47,6 +48,7 @@ import libcore.util.NativeAllocationRegistry; */ public class Paint { + @UnsupportedAppUsage private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; @@ -69,6 +71,7 @@ public class Paint { private MaskFilter mMaskFilter; private PathEffect mPathEffect; private Shader mShader; + @UnsupportedAppUsage private Typeface mTypeface; private Xfermode mXfermode; @@ -628,6 +631,7 @@ public class Paint { } /** @hide */ + @UnsupportedAppUsage public void setCompatibilityScaling(float factor) { if (factor == 1.0) { mHasCompatScaling = false; @@ -645,6 +649,7 @@ public class Paint { * * @hide */ + @UnsupportedAppUsage public long getNativeInstance() { long newNativeShader = mShader == null ? 0 : mShader.getNativeInstance(); if (newNativeShader != mNativeShader) { @@ -1732,6 +1737,7 @@ public class Paint { * * @hide */ + @UnsupportedAppUsage public void setHyphenEdit(int hyphen) { nSetHyphenEdit(mNativePaint, hyphen); } @@ -2264,6 +2270,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) { @@ -2457,6 +2464,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; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 098cdc67555d..fa8ba5b194d6 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -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; @@ -40,10 +41,12 @@ public class Path { /** * @hide */ + @UnsupportedAppUsage public boolean isSimplePath = true; /** * @hide */ + @UnsupportedAppUsage public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java index 08eeaff69f9b..d8bb1d787ea8 100644 --- a/graphics/java/android/graphics/Picture.java +++ b/graphics/java/android/graphics/Picture.java @@ -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 Canvas mRecordingCanvas; + @UnsupportedAppUsage private long mNativePicture; private static final int WORKING_STREAM_STORAGE = 16 * 1024; diff --git a/graphics/java/android/graphics/PorterDuff.java b/graphics/java/android/graphics/PorterDuff.java index d7d3049b0efa..fba50430f2ef 100644 --- a/graphics/java/android/graphics/PorterDuff.java +++ b/graphics/java/android/graphics/PorterDuff.java @@ -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; } diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 01d5825dd1e0..3c90b72eaed0 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -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; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index f4b11917a415..41d26281b723 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -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; /** diff --git a/graphics/java/android/graphics/Rect.java b/graphics/java/android/graphics/Rect.java index deafb6638ece..584117711d2d 100644 --- a/graphics/java/android/graphics/Rect.java +++ b/graphics/java/android/graphics/Rect.java @@ -20,6 +20,7 @@ import android.annotation.CheckResult; import android.os.Parcel; import android.os.Parcelable; +import android.annotation.UnsupportedAppUsage; import android.text.TextUtils; import java.io.PrintWriter; import java.util.regex.Matcher; @@ -189,6 +190,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); @@ -643,6 +645,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); diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index dca6d9ed3b2f..db6ebd5f22c3 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -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); } diff --git a/graphics/java/android/graphics/Shader.java b/graphics/java/android/graphics/Shader.java index 40288f5ec8af..40bcc9e26a3d 100644 --- a/graphics/java/android/graphics/Shader.java +++ b/graphics/java/android/graphics/Shader.java @@ -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; } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 97edf220e242..675bb47520ba 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -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; @@ -374,6 +379,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) { @@ -401,6 +407,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(); diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index b6b80b4f57dc..f944d85d3cf2 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -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; /** diff --git a/graphics/java/android/graphics/TableMaskFilter.java b/graphics/java/android/graphics/TableMaskFilter.java index d0c1438285a8..d81c491e07e0 100644 --- a/graphics/java/android/graphics/TableMaskFilter.java +++ b/graphics/java/android/graphics/TableMaskFilter.java @@ -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)); } diff --git a/graphics/java/android/graphics/TemporaryBuffer.java b/graphics/java/android/graphics/TemporaryBuffer.java index 36a2275738c2..0ae2c703c21c 100644 --- a/graphics/java/android/graphics/TemporaryBuffer.java +++ b/graphics/java/android/graphics/TemporaryBuffer.java @@ -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; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index c4b56c333c64..7b8876496710 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -27,6 +27,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.FontListParser; import android.graphics.fonts.FontVariationAxis; @@ -94,6 +95,7 @@ public class Typeface { /** The NORMAL style of the default monospace typeface. */ public static final Typeface MONOSPACE; + @UnsupportedAppUsage static Typeface[] sDefaults; private static final LongSparseArray<SparseArray<Typeface>> sTypefaceCache = new LongSparseArray<>(3); @@ -105,6 +107,7 @@ public class Typeface { private static final LruCache<String, Typeface> sDynamicTypefaceCache = new LruCache<>(16); static Typeface sDefaultTypeface; + @UnsupportedAppUsage static Map<String, Typeface> sSystemFontMap; static FontFamily[] sFallbackFonts; private static final Object sLock = new Object(); @@ -114,6 +117,7 @@ public class Typeface { /** * @hide */ + @UnsupportedAppUsage public long native_instance; // Style @@ -122,6 +126,7 @@ public class Typeface { public static final int ITALIC = 2; public static final int BOLD_ITALIC = 3; + @UnsupportedAppUsage private int mStyle = 0; private int mWeight = 0; @@ -137,6 +142,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); @@ -840,6 +846,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++) { @@ -862,6 +869,7 @@ public class Typeface { * upright font is used. * @param families array of font families */ + @UnsupportedAppUsage private static Typeface createFromFamiliesWithDefault(FontFamily[] families, int weight, int italic) { long[] ptrArray = new long[families.length + sFallbackFonts.length]; @@ -875,6 +883,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"); @@ -1065,10 +1074,12 @@ 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); private static native void nativeUnref(long native_instance); private static native int nativeGetStyle(long native_instance); private static native int nativeGetWeight(long native_instance); + @UnsupportedAppUsage private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native void nativeSetDefault(long native_instance); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index a5da5d09ebaf..6f4adfde7ff9 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -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; } diff --git a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java index d714ca830976..b29fd4db5803 100644 --- a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java @@ -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; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 3ed6a788b640..00380c5d0d95 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -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, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 90d6ab867fe1..bc00b43ddc96 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -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; @@ -301,6 +302,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; /** @@ -309,6 +311,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; + @UnsupportedAppUsage private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -638,6 +641,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; @@ -1768,6 +1772,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); } diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java index 0fd1741610ec..57764c2cb693 100644 --- a/graphics/java/android/graphics/drawable/AnimationDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java @@ -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. */ diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java index 7ad062a6f6f9..9d278ad189e5 100644 --- a/graphics/java/android/graphics/drawable/BitmapDrawable.java +++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java @@ -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; @@ -86,9 +87,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; @@ -222,6 +225,7 @@ public class BitmapDrawable extends Drawable { } /** @hide */ + @UnsupportedAppUsage public void setBitmap(Bitmap bitmap) { if (mBitmapState.mBitmap != bitmap) { mBitmapState.mBitmap = bitmap; @@ -680,6 +684,7 @@ public class BitmapDrawable extends Drawable { /** * @hide only needed by a hack within ProgressBar */ + @UnsupportedAppUsage public ColorStateList getTint() { return mBitmapState.mTint; } @@ -687,6 +692,7 @@ public class BitmapDrawable extends Drawable { /** * @hide only needed by a hack within ProgressBar */ + @UnsupportedAppUsage public Mode getTintMode() { return mBitmapState.mTintMode; } diff --git a/graphics/java/android/graphics/drawable/ClipDrawable.java b/graphics/java/android/graphics/drawable/ClipDrawable.java index d925b6b95c66..31fdb025bbc5 100644 --- a/graphics/java/android/graphics/drawable/ClipDrawable.java +++ b/graphics/java/android/graphics/drawable/ClipDrawable.java @@ -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() { diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 9ae747de2f82..7cbe92910f57 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -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; diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index f17cd768c386..2a6d9129e13f 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -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; @@ -183,6 +184,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; @@ -201,6 +203,7 @@ public abstract class Drawable { * * @hide */ + @UnsupportedAppUsage protected int mSrcDensityOverride = 0; /** @@ -711,6 +714,7 @@ public abstract class Drawable { * * @hide magic! */ + @UnsupportedAppUsage public boolean isProjected() { return false; } @@ -1354,6 +1358,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 { @@ -1473,6 +1478,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) { @@ -1579,6 +1585,7 @@ public abstract class Drawable { * * @hide */ + @UnsupportedAppUsage public static PorterDuff.Mode parseTintMode(int value, Mode defaultMode) { switch (value) { case 3: return Mode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index aa4cd9cba4a7..8c893e0d88f3 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -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; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index eea7048ca534..0fea256f5010 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -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; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index cf821bb6ac8b..8e5151117115 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -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; diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 6c3aea2202a2..3da12209e333 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -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; @@ -154,10 +155,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; @@ -1774,27 +1779,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; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index c329918afc27..7c4fb7c59faa 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -18,6 +18,7 @@ package android.graphics.drawable; import android.annotation.ColorInt; import android.annotation.DrawableRes; +import android.annotation.UnsupportedAppUsage; import android.content.res.ColorStateList; import android.content.ContentResolver; import android.content.Context; @@ -73,6 +74,7 @@ public final class Icon implements Parcelable { private static final int VERSION_STREAM_SERIALIZER = 1; + @UnsupportedAppUsage private final int mType; private ColorStateList mTintList; @@ -89,6 +91,7 @@ public final class Icon implements Parcelable { // TYPE_RESOURCE: package name // TYPE_URI: uri string + @UnsupportedAppUsage private String mString1; // TYPE_RESOURCE: resId @@ -115,6 +118,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); @@ -130,6 +134,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); @@ -144,6 +149,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); @@ -158,6 +164,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); @@ -171,6 +178,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); @@ -524,6 +532,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."); @@ -656,6 +665,7 @@ public final class Icon implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public boolean hasTint() { return (mTintList != null) || (mTintMode != DEFAULT_TINT_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 443aa4931ee3..f342dde24d01 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -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; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 4725c2c4c0e5..b4392c8d023f 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -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; diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index 17900204fa22..492851cf8a75 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -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; @@ -584,6 +586,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; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 8f314c9c36aa..2cf26ee7a929 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -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; @@ -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. */ @@ -160,6 +162,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. */ @@ -910,6 +913,7 @@ public class RippleDrawable extends LayerDrawable { mMask.draw(canvas); } + @UnsupportedAppUsage private Paint getRipplePaint() { if (mRipplePaint == null) { mRipplePaint = new Paint(); @@ -960,6 +964,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; } @@ -990,6 +995,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; + @UnsupportedAppUsage ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index c0dfe77cf4f3..db5f082bd853 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -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; /** diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index 51e143baeac4..91ed061e511d 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -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() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index c98f1608c665..fa18f64981b9 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -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; diff --git a/graphics/java/android/graphics/drawable/TransitionDrawable.java b/graphics/java/android/graphics/drawable/TransitionDrawable.java index 3dfd68018a6b..276f3662189b 100644 --- a/graphics/java/android/graphics/drawable/TransitionDrawable.java +++ b/graphics/java/android/graphics/drawable/TransitionDrawable.java @@ -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; /** diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index ceac3253e178..7832832c30d4 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -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; @@ -243,6 +244,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; + @UnsupportedAppUsage private PorterDuffColorFilter mTintFilter; private ColorFilter mColorFilter; @@ -311,6 +313,7 @@ public class VectorDrawable extends Drawable { mMutated = false; } + @UnsupportedAppUsage Object getTargetByName(String name) { return mVectorState.mVGTargetsMap.get(name); } @@ -790,6 +793,7 @@ public class VectorDrawable extends Drawable { return super.getChangingConfigurations() | mVectorState.getChangingConfigurations(); } + @UnsupportedAppUsage void setAllowCaching(boolean allowCaching) { nSetAllowCaching(mVectorState.getNativeRenderer(), allowCaching); } @@ -1414,6 +1418,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setRotation(float rotation) { if (isTreeValid()) { nSetRotation(mNativePtr, rotation); @@ -1426,6 +1431,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setPivotX(float pivotX) { if (isTreeValid()) { nSetPivotX(mNativePtr, pivotX); @@ -1438,6 +1444,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setPivotY(float pivotY) { if (isTreeValid()) { nSetPivotY(mNativePtr, pivotY); @@ -1474,6 +1481,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setTranslateX(float translateX) { if (isTreeValid()) { nSetTranslateX(mNativePtr, translateX); @@ -1486,6 +1494,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setTranslateY(float translateY) { if (isTreeValid()) { nSetTranslateY(mNativePtr, translateY); diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 99564fab94cd..f12b31f1c419 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -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; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 29e1ea0fee5d..5aca478f0d49 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -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; @@ -116,6 +117,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(); diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 7e959a87da5d..da798d26acdc 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -104,7 +104,11 @@ public class KeyStore { public static final int FLAG_CRITICAL_TO_DEVICE_ENCRYPTION = 1 << 3; // States - public enum State { UNLOCKED, LOCKED, UNINITIALIZED }; + public enum State { + UNLOCKED, + LOCKED, + UNINITIALIZED + }; private int mError = NO_ERROR; diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 28ac78493793..4100e74de8c9 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -497,6 +497,9 @@ public class ConnectivityService extends IConnectivityManager.Stub private final IpConnectivityLog mMetricsLog; + @GuardedBy("mBandwidthRequests") + private final SparseArray<Integer> mBandwidthRequests = new SparseArray(10); + @VisibleForTesting final MultinetworkPolicyTracker mMultinetworkPolicyTracker; @@ -2069,6 +2072,18 @@ public class ConnectivityService extends IConnectivityManager.Stub pw.println("currently holding WakeLock for: " + (duration / 1000) + "s"); } mWakelockLogs.reverseDump(fd, pw, args); + + pw.println(); + pw.println("bandwidth update requests (by uid):"); + pw.increaseIndent(); + synchronized (mBandwidthRequests) { + for (int i = 0; i < mBandwidthRequests.size(); i++) { + pw.println("[" + mBandwidthRequests.keyAt(i) + + "]: " + mBandwidthRequests.valueAt(i)); + } + } + pw.decreaseIndent(); + pw.decreaseIndent(); } } @@ -4223,6 +4238,14 @@ public class ConnectivityService extends IConnectivityManager.Stub } if (nai != null) { nai.asyncChannel.sendMessage(android.net.NetworkAgent.CMD_REQUEST_BANDWIDTH_UPDATE); + synchronized (mBandwidthRequests) { + final int uid = Binder.getCallingUid(); + Integer uidReqs = mBandwidthRequests.get(uid); + if (uidReqs == null) { + uidReqs = new Integer(0); + } + mBandwidthRequests.put(uid, ++uidReqs); + } return true; } return false; @@ -5803,4 +5826,4 @@ public class ConnectivityService extends IConnectivityManager.Stub pw.println(" Get airplane mode."); } } -}
\ No newline at end of file +} diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 34d5b3f1a1db..02222cc6f963 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1789,7 +1789,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { long token = Binder.clearCallingIdentity(); try { return LocationAccessPolicy.canAccessCellLocation(mContext, - r.callingPackage, r.callerUid, r.callerPid); + r.callingPackage, r.callerUid, r.callerPid, + /*throwOnDeniedPermission*/ false); } finally { Binder.restoreCallingIdentity(token); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 02d5d26723dc..e91b26a8104b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4108,7 +4108,7 @@ public class ActivityManagerService extends IActivityManager.Stub // the package was initially frozen through KILL_APPLICATION_MSG, so // it doesn't hurt to use it again.) forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false, - false, true, false, false, UserHandle.getUserId(app.userId), "start failure"); + false, true, false, false, app.userId, "start failure"); } } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 25e67c8ee17b..a570176e04a4 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -842,6 +842,7 @@ public abstract class Connection extends Conferenceable { public void onRemoteRttRequest(Connection c) {} /** @hide */ public void onPhoneAccountChanged(Connection c, PhoneAccountHandle pHandle) {} + public void onConnectionTimeReset(Connection c) {} } /** @@ -2364,6 +2365,16 @@ public abstract class Connection extends Conferenceable { } /** + * @hide + * Resets the cdma connection time. + */ + public final void resetConnectionTime() { + for (Listener l : mListeners) { + l.onConnectionTimeReset(this); + } + } + + /** * Returns the connections or conferences with which this connection can be conferenced. */ public final List<Conferenceable> getConferenceables() { diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 4045eea4db02..73c841a64159 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -1474,6 +1474,13 @@ public abstract class ConnectionService extends Service { mAdapter.onPhoneAccountChanged(id, pHandle); } } + + public void onConnectionTimeReset(Connection c) { + String id = mIdByConnection.get(c); + if (id != null) { + mAdapter.resetConnectionTime(id); + } + } }; /** {@inheritDoc} */ diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java index 0d319bbc1d2a..520e7eda6f69 100644 --- a/telecomm/java/android/telecom/ConnectionServiceAdapter.java +++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java @@ -255,6 +255,18 @@ final class ConnectionServiceAdapter implements DeathRecipient { } /** + * Resets the cdma connection time. + */ + void resetConnectionTime(String callId) { + for (IConnectionServiceAdapter adapter : mAdapters) { + try { + adapter.resetConnectionTime(callId, Log.getExternalSession()); + } catch (RemoteException e) { + } + } + } + + /** * Indicates that the call no longer exists. Can be used with either a call or a conference * call. * diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java index 3e1bf7790304..78d65e643abc 100644 --- a/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java +++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java @@ -610,6 +610,11 @@ final class ConnectionServiceAdapterServant { public void onConnectionServiceFocusReleased(Session.Info sessionInfo) { mHandler.obtainMessage(MSG_CONNECTION_SERVICE_FOCUS_RELEASED).sendToTarget(); } + + @Override + public void resetConnectionTime(String callId, Session.Info sessionInfo) { + // Do nothing + } }; public ConnectionServiceAdapterServant(IConnectionServiceAdapter delegate) { diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index bb4b483de326..9821dcbce85e 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -466,6 +466,11 @@ final class RemoteConnectionService { Log.w(this, "onRemoteRttRequest called on a remote conference"); } } + + @Override + public void resetConnectionTime(String callId, Session.Info sessionInfo) { + // Do nothing + } }; private final ConnectionServiceAdapterServant mServant = diff --git a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl index be474bd467ca..0157a5863363 100644 --- a/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl @@ -121,4 +121,6 @@ oneway interface IConnectionServiceAdapter { in Session.Info sessionInfo); void onConnectionServiceFocusReleased(in Session.Info sessionInfo); + + void resetConnectionTime(String callIdi, in Session.Info sessionInfo); } diff --git a/telephony/java/android/telephony/LocationAccessPolicy.java b/telephony/java/android/telephony/LocationAccessPolicy.java index 19b3d0d41a0d..cc10eb9a1400 100644 --- a/telephony/java/android/telephony/LocationAccessPolicy.java +++ b/telephony/java/android/telephony/LocationAccessPolicy.java @@ -48,10 +48,11 @@ public final class LocationAccessPolicy { * @param pkgName Package name of the application requesting access * @param uid The uid of the package * @param pid The pid of the package + * @param throwOnDeniedPermission Whether to throw if the location permission is denied. * @return boolean true or false if permissions is granted */ public static boolean canAccessCellLocation(@NonNull Context context, @NonNull String pkgName, - int uid, int pid) throws SecurityException { + int uid, int pid, boolean throwOnDeniedPermission) throws SecurityException { Trace.beginSection("TelephonyLocationCheck"); try { // Always allow the phone process and system server to access location. This avoid @@ -68,10 +69,11 @@ public final class LocationAccessPolicy { // where a legacy app the user is not using tracks their location. // Granting ACCESS_FINE_LOCATION to an app automatically grants it // ACCESS_COARSE_LOCATION. - - if (context.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, pid, uid) == - PackageManager.PERMISSION_DENIED) { - if (DBG) Log.w(TAG, "Permission checked failed (" + pid + "," + uid + ")"); + if (throwOnDeniedPermission) { + context.enforcePermission(Manifest.permission.ACCESS_COARSE_LOCATION, + pid, uid, "canAccessCellLocation"); + } else if (context.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, + pid, uid) == PackageManager.PERMISSION_DENIED) { return false; } final int opCode = AppOpsManager.permissionToOpCode( diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 53cf87707205..37d56eed7434 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1471,7 +1471,8 @@ public class TelephonyManager { ITelephony telephony = getITelephony(); if (telephony == null) return null; - return telephony.getNeighboringCellInfo(mContext.getOpPackageName()); + return telephony.getNeighboringCellInfo(mContext.getOpPackageName(), + mContext.getApplicationInfo().targetSdkVersion); } catch (RemoteException ex) { return null; } catch (NullPointerException ex) { diff --git a/telephony/java/com/android/ims/internal/uce/common/CapInfo.java b/telephony/java/com/android/ims/internal/uce/common/CapInfo.java index 56969a8fb612..a9847ba61cf6 100644 --- a/telephony/java/com/android/ims/internal/uce/common/CapInfo.java +++ b/telephony/java/com/android/ims/internal/uce/common/CapInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.common; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -73,6 +74,7 @@ public class CapInfo implements Parcelable { /** * Constructor for the CapInfo class. */ + @UnsupportedAppUsage public CapInfo() { }; @@ -80,6 +82,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IM is supported. */ + @UnsupportedAppUsage public boolean isImSupported() { return mImSupported; } @@ -87,6 +90,7 @@ public class CapInfo implements Parcelable { /** * Sets IM as supported or not supported. */ + @UnsupportedAppUsage public void setImSupported(boolean imSupported) { this.mImSupported = imSupported; } @@ -94,6 +98,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Thumbnail is supported. */ + @UnsupportedAppUsage public boolean isFtThumbSupported() { return mFtThumbSupported; } @@ -101,6 +106,7 @@ public class CapInfo implements Parcelable { /** * Sets FT thumbnail as supported or not supported. */ + @UnsupportedAppUsage public void setFtThumbSupported(boolean ftThumbSupported) { this.mFtThumbSupported = ftThumbSupported; } @@ -110,6 +116,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT Store and Forward is supported */ + @UnsupportedAppUsage public boolean isFtSnFSupported() { return mFtSnFSupported; } @@ -117,6 +124,7 @@ public class CapInfo implements Parcelable { /** * Sets FT Store and Forward as supported or not supported. */ + @UnsupportedAppUsage public void setFtSnFSupported(boolean ftSnFSupported) { this.mFtSnFSupported = ftSnFSupported; } @@ -124,6 +132,7 @@ public class CapInfo implements Parcelable { /** * Checks whether File transfer HTTP is supported. */ + @UnsupportedAppUsage public boolean isFtHttpSupported() { return mFtHttpSupported; } @@ -131,6 +140,7 @@ public class CapInfo implements Parcelable { /** * Sets File transfer HTTP as supported or not supported. */ + @UnsupportedAppUsage public void setFtHttpSupported(boolean ftHttpSupported) { this.mFtHttpSupported = ftHttpSupported; } @@ -138,6 +148,7 @@ public class CapInfo implements Parcelable { /** * Checks whether FT is supported. */ + @UnsupportedAppUsage public boolean isFtSupported() { return mFtSupported; } @@ -145,6 +156,7 @@ public class CapInfo implements Parcelable { /** * Sets FT as supported or not supported. */ + @UnsupportedAppUsage public void setFtSupported(boolean ftSupported) { this.mFtSupported = ftSupported; } @@ -152,6 +164,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IS is supported. */ + @UnsupportedAppUsage public boolean isIsSupported() { return mIsSupported; } @@ -159,6 +172,7 @@ public class CapInfo implements Parcelable { /** * Sets IS as supported or not supported. */ + @UnsupportedAppUsage public void setIsSupported(boolean isSupported) { this.mIsSupported = isSupported; } @@ -166,6 +180,7 @@ public class CapInfo implements Parcelable { /** * Checks whether video sharing is supported during a CS call. */ + @UnsupportedAppUsage public boolean isVsDuringCSSupported() { return mVsDuringCSSupported; } @@ -174,6 +189,7 @@ public class CapInfo implements Parcelable { * Sets video sharing as supported or not supported during a CS * call. */ + @UnsupportedAppUsage public void setVsDuringCSSupported(boolean vsDuringCSSupported) { this.mVsDuringCSSupported = vsDuringCSSupported; } @@ -182,6 +198,7 @@ public class CapInfo implements Parcelable { * Checks whether video sharing outside a voice call is * supported. */ + @UnsupportedAppUsage public boolean isVsSupported() { return mVsSupported; } @@ -189,6 +206,7 @@ public class CapInfo implements Parcelable { /** * Sets video sharing as supported or not supported. */ + @UnsupportedAppUsage public void setVsSupported(boolean vsSupported) { this.mVsSupported = vsSupported; } @@ -196,6 +214,7 @@ public class CapInfo implements Parcelable { /** * Checks whether social presence is supported. */ + @UnsupportedAppUsage public boolean isSpSupported() { return mSpSupported; } @@ -203,6 +222,7 @@ public class CapInfo implements Parcelable { /** * Sets social presence as supported or not supported. */ + @UnsupportedAppUsage public void setSpSupported(boolean spSupported) { this.mSpSupported = spSupported; } @@ -211,6 +231,7 @@ public class CapInfo implements Parcelable { * Checks whether capability discovery via presence is * supported. */ + @UnsupportedAppUsage public boolean isCdViaPresenceSupported() { return mCdViaPresenceSupported; } @@ -219,6 +240,7 @@ public class CapInfo implements Parcelable { * Sets capability discovery via presence as supported or not * supported. */ + @UnsupportedAppUsage public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) { this.mCdViaPresenceSupported = cdViaPresenceSupported; } @@ -226,6 +248,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP voice call is supported. */ + @UnsupportedAppUsage public boolean isIpVoiceSupported() { return mIpVoiceSupported; } @@ -233,6 +256,7 @@ public class CapInfo implements Parcelable { /** * Sets IP voice call as supported or not supported. */ + @UnsupportedAppUsage public void setIpVoiceSupported(boolean ipVoiceSupported) { this.mIpVoiceSupported = ipVoiceSupported; } @@ -240,6 +264,7 @@ public class CapInfo implements Parcelable { /** * Checks whether IP video call is supported. */ + @UnsupportedAppUsage public boolean isIpVideoSupported() { return mIpVideoSupported; } @@ -247,6 +272,7 @@ public class CapInfo implements Parcelable { /** * Sets IP video call as supported or not supported. */ + @UnsupportedAppUsage public void setIpVideoSupported(boolean ipVideoSupported) { this.mIpVideoSupported = ipVideoSupported; } @@ -255,6 +281,7 @@ public class CapInfo implements Parcelable { * Checks whether Geo location Pull using File Transfer is * supported. */ + @UnsupportedAppUsage public boolean isGeoPullFtSupported() { return mGeoPullFtSupported; } @@ -263,6 +290,7 @@ public class CapInfo implements Parcelable { * Sets Geo location Pull using File Transfer as supported or * not supported. */ + @UnsupportedAppUsage public void setGeoPullFtSupported(boolean geoPullFtSupported) { this.mGeoPullFtSupported = geoPullFtSupported; } @@ -270,6 +298,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Pull is supported. */ + @UnsupportedAppUsage public boolean isGeoPullSupported() { return mGeoPullSupported; } @@ -277,6 +306,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Pull as supported or not supported. */ + @UnsupportedAppUsage public void setGeoPullSupported(boolean geoPullSupported) { this.mGeoPullSupported = geoPullSupported; } @@ -284,6 +314,7 @@ public class CapInfo implements Parcelable { /** * Checks whether Geo Push is supported. */ + @UnsupportedAppUsage public boolean isGeoPushSupported() { return mGeoPushSupported; } @@ -291,6 +322,7 @@ public class CapInfo implements Parcelable { /** * Sets Geo Push as supported or not supported. */ + @UnsupportedAppUsage public void setGeoPushSupported(boolean geoPushSupported) { this.mGeoPushSupported = geoPushSupported; } @@ -298,6 +330,7 @@ public class CapInfo implements Parcelable { /** * Checks whether short messaging is supported. */ + @UnsupportedAppUsage public boolean isSmSupported() { return mSmSupported; } @@ -305,6 +338,7 @@ public class CapInfo implements Parcelable { /** * Sets short messaging as supported or not supported. */ + @UnsupportedAppUsage public void setSmSupported(boolean smSupported) { this.mSmSupported = smSupported; } @@ -312,18 +346,22 @@ public class CapInfo implements Parcelable { /** * Checks whether store/forward and group chat are supported. */ + @UnsupportedAppUsage public boolean isFullSnFGroupChatSupported() { return mFullSnFGroupChatSupported; } + @UnsupportedAppUsage public boolean isRcsIpVoiceCallSupported() { return mRcsIpVoiceCallSupported; } + @UnsupportedAppUsage public boolean isRcsIpVideoCallSupported() { return mRcsIpVideoCallSupported; } + @UnsupportedAppUsage public boolean isRcsIpVideoOnlyCallSupported() { return mRcsIpVideoOnlyCallSupported; } @@ -331,16 +369,20 @@ public class CapInfo implements Parcelable { /** * Sets store/forward and group chat supported or not supported. */ + @UnsupportedAppUsage public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) { this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported; } + @UnsupportedAppUsage public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) { this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported; } + @UnsupportedAppUsage public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) { this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported; } + @UnsupportedAppUsage public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) { this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported; } @@ -351,17 +393,20 @@ public class CapInfo implements Parcelable { } /** Sets the list of supported extensions. */ + @UnsupportedAppUsage public void setExts(String[] exts) { this.mExts = exts; } /** Gets the time stamp for when to query again. */ + @UnsupportedAppUsage public long getCapTimestamp() { return mCapTimestamp; } /** Sets the time stamp for when to query again. */ + @UnsupportedAppUsage public void setCapTimestamp(long capTimestamp) { this.mCapTimestamp = capTimestamp; } diff --git a/telephony/java/com/android/ims/internal/uce/common/StatusCode.java b/telephony/java/com/android/ims/internal/uce/common/StatusCode.java index ad9b669e5f2b..3921cfbbfce7 100644 --- a/telephony/java/com/android/ims/internal/uce/common/StatusCode.java +++ b/telephony/java/com/android/ims/internal/uce/common/StatusCode.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.common; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -71,12 +72,14 @@ public class StatusCode implements Parcelable { * Constructor for the StatusCode class. * @hide */ + @UnsupportedAppUsage public StatusCode() {} /** * Gets the status code. * @hide */ + @UnsupportedAppUsage public int getStatusCode() { return mStatusCode; } @@ -85,6 +88,7 @@ public class StatusCode implements Parcelable { * Sets the status code. * @hide */ + @UnsupportedAppUsage public void setStatusCode(int nStatusCode) { this.mStatusCode = nStatusCode; } diff --git a/telephony/java/com/android/ims/internal/uce/common/UceLong.java b/telephony/java/com/android/ims/internal/uce/common/UceLong.java index fd07fe8d2210..720789918e45 100644 --- a/telephony/java/com/android/ims/internal/uce/common/UceLong.java +++ b/telephony/java/com/android/ims/internal/uce/common/UceLong.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.common; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.Log; @@ -32,6 +33,7 @@ public class UceLong implements Parcelable { * Constructor for the UceLong class. * @hide */ + @UnsupportedAppUsage public UceLong() { }; @@ -39,6 +41,7 @@ public class UceLong implements Parcelable { * Gets the long value. * @hide */ + @UnsupportedAppUsage public long getUceLong() { return mUceLong; } @@ -47,6 +50,7 @@ public class UceLong implements Parcelable { * Sets the long value. * @hide */ + @UnsupportedAppUsage public void setUceLong(long uceLong) { this.mUceLong = uceLong; } @@ -54,6 +58,7 @@ public class UceLong implements Parcelable { /** Get the client ID as integer value. * @hide */ + @UnsupportedAppUsage public int getClientId() { return mClientId; } @@ -62,6 +67,7 @@ public class UceLong implements Parcelable { * Set the client ID as integer value. * @hide */ + @UnsupportedAppUsage public void setClientId(int nClientId) { this.mClientId = nClientId; } diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java index c570f495a4ac..bcb9f2d6284d 100644 --- a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java @@ -15,6 +15,7 @@ */ package com.android.ims.internal.uce.options; +import android.annotation.UnsupportedAppUsage; import com.android.ims.internal.uce.common.CapInfo; import android.os.Parcel; import android.os.Parcelable; @@ -30,10 +31,12 @@ public class OptionsCapInfo implements Parcelable { return new OptionsCapInfo(); } + @UnsupportedAppUsage public String getSdp() { return mSdp; } + @UnsupportedAppUsage public void setSdp(String sdp) { this.mSdp = sdp; } @@ -41,16 +44,19 @@ public class OptionsCapInfo implements Parcelable { /** * Constructor for the OptionsCapInfo class. */ + @UnsupportedAppUsage public OptionsCapInfo() { mCapInfo = new CapInfo(); }; + @UnsupportedAppUsage public CapInfo getCapInfo() { return mCapInfo; } /** * Sets the CapInfo */ + @UnsupportedAppUsage public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java index 35f769cdc072..14c64ac105bb 100644 --- a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java @@ -17,6 +17,7 @@ package com.android.ims.internal.uce.options; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -55,6 +56,7 @@ public class OptionsCmdId implements Parcelable { * Sets the command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -63,6 +65,7 @@ public class OptionsCmdId implements Parcelable { * Constructor for the OptionsCDCmdId class. * @hide */ + @UnsupportedAppUsage public OptionsCmdId(){}; /** @hide */ diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java index dab191cfb364..4af3e6e3cea4 100644 --- a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java @@ -19,6 +19,7 @@ package com.android.ims.internal.uce.options; import com.android.ims.internal.uce.common.StatusCode; import com.android.ims.internal.uce.common.CapInfo; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -41,6 +42,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -56,6 +58,7 @@ public class OptionsCmdStatus implements Parcelable { /** Sets the user data. @hide */ + @UnsupportedAppUsage public void setUserData(int userData) { this.mUserData = userData; } @@ -72,6 +75,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the status code. * @hide */ + @UnsupportedAppUsage public void setStatus(StatusCode status) { this.mStatus = status; } @@ -80,6 +84,7 @@ public class OptionsCmdStatus implements Parcelable { * Constructor for the OptionsCmdStatus class. * @hide */ + @UnsupportedAppUsage public OptionsCmdStatus() { mStatus = new StatusCode(); mCapInfo = new CapInfo(); @@ -96,6 +101,7 @@ public class OptionsCmdStatus implements Parcelable { * Sets the CapInfo * @hide */ + @UnsupportedAppUsage public void setCapInfo(CapInfo capInfo) { this.mCapInfo = capInfo; } diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java index 0b9dd21ffe3f..c5f333d35ba5 100644 --- a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.options; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -41,6 +42,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the Options command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(OptionsCmdId cmdId) { this.mCmdId = cmdId; } @@ -57,6 +59,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the request ID * @hide */ + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -73,6 +76,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ + @UnsupportedAppUsage public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -89,6 +93,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ + @UnsupportedAppUsage public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -105,6 +110,7 @@ public class OptionsSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ + @UnsupportedAppUsage public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -113,6 +119,7 @@ public class OptionsSipResponse implements Parcelable { * Constructor for the OptionsSipResponse class. * @hide */ + @UnsupportedAppUsage public OptionsSipResponse() { mCmdId = new OptionsCmdId(); }; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java index 60fc2260304f..745df5b71aa7 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java @@ -18,6 +18,7 @@ package com.android.ims.internal.uce.presence; import com.android.ims.internal.uce.common.CapInfo; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -26,12 +27,14 @@ import android.os.Parcelable; public class PresCapInfo implements Parcelable { private CapInfo mCapInfo; + @UnsupportedAppUsage private String mContactUri = ""; /** * Gets the UCE capability information. * @hide */ + @UnsupportedAppUsage public CapInfo getCapInfo() { return mCapInfo; } @@ -48,6 +51,7 @@ public class PresCapInfo implements Parcelable { * Gets the contact URI. * @hide */ + @UnsupportedAppUsage public String getContactUri() { return mContactUri; } diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java index 395f3e87fc29..41020ec5b49b 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -57,6 +58,7 @@ public class PresCmdId implements Parcelable { * Sets the command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(int nCmdId) { this.mCmdId = nCmdId; } @@ -66,6 +68,7 @@ public class PresCmdId implements Parcelable { * Constructor for the PresCmdId class. * @hide */ + @UnsupportedAppUsage public PresCmdId(){}; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java index a5b498bd9105..ff8069c569ff 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java @@ -18,6 +18,7 @@ package com.android.ims.internal.uce.presence; import com.android.ims.internal.uce.common.StatusCode; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -42,6 +43,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -58,6 +60,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the user data. * @hide */ + @UnsupportedAppUsage public void setUserData(int userData) { this.mUserData = userData; } @@ -73,6 +76,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the status code. * @hide */ + @UnsupportedAppUsage public void setStatus(StatusCode status) { this.mStatus = status; } @@ -89,6 +93,7 @@ public class PresCmdStatus implements Parcelable{ * Sets the request ID. * @hide */ + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -97,6 +102,7 @@ public class PresCmdStatus implements Parcelable{ * Constructor for the PresCmdStatus class. * @hide */ + @UnsupportedAppUsage public PresCmdStatus() { mStatus = new StatusCode(); }; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java index 3e8531a73421..87193e36ce90 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -65,6 +66,7 @@ public class PresPublishTriggerType implements Parcelable { * Sets the publish trigger type. * @hide */ + @UnsupportedAppUsage public void setPublishTrigeerType(int nPublishTriggerType) { this.mPublishTriggerType = nPublishTriggerType; } @@ -74,6 +76,7 @@ public class PresPublishTriggerType implements Parcelable { * Constructor for the PresPublishTriggerType class. * @hide */ + @UnsupportedAppUsage public PresPublishTriggerType(){}; /** @hide */ diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java index a073a234d1ec..237c9994451a 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -38,6 +39,7 @@ public class PresResInfo implements Parcelable { * Sets the Presence service resource instance information. * @hide */ + @UnsupportedAppUsage public void setInstanceInfo(PresResInstanceInfo instanceInfo) { this.mInstanceInfo = instanceInfo; } @@ -54,6 +56,7 @@ public class PresResInfo implements Parcelable { * Sets the resource URI. * @hide */ + @UnsupportedAppUsage public void setResUri(String resUri) { this.mResUri = resUri; } @@ -70,6 +73,7 @@ public class PresResInfo implements Parcelable { * Sets the display name. * @hide */ + @UnsupportedAppUsage public void setDisplayName(String displayName) { this.mDisplayName = displayName; } @@ -79,6 +83,7 @@ public class PresResInfo implements Parcelable { * Constructor for the PresResInstanceInfo class. * @hide */ + @UnsupportedAppUsage public PresResInfo() { mInstanceInfo = new PresResInstanceInfo(); }; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java index 430cff196d33..29699ea6c802 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import java.util.Arrays; @@ -59,6 +60,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource instance state. * @hide */ + @UnsupportedAppUsage public void setResInstanceState(int nResInstanceState) { this.mResInstanceState = nResInstanceState; } @@ -75,6 +77,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the resource ID. * @hide */ + @UnsupportedAppUsage public void setResId(String resourceId) { this.mId = resourceId; } @@ -93,6 +96,7 @@ public class PresResInstanceInfo implements Parcelable{ * code. * @hide */ + @UnsupportedAppUsage public void setReason(String reason) { this.mReason = reason; } @@ -109,6 +113,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the entity URI. * @hide */ + @UnsupportedAppUsage public void setPresentityUri(String presentityUri) { this.mPresentityUri = presentityUri; } @@ -125,6 +130,7 @@ public class PresResInstanceInfo implements Parcelable{ * Sets the tuple information. * @hide */ + @UnsupportedAppUsage public void setTupleInfo(PresTupleInfo[] tupleInfo) { this.mTupleInfoArray = new PresTupleInfo[tupleInfo.length]; this.mTupleInfoArray = tupleInfo; @@ -135,6 +141,7 @@ public class PresResInstanceInfo implements Parcelable{ * Constructor for the PresResInstanceInfo class. * @hide */ + @UnsupportedAppUsage public PresResInstanceInfo(){ }; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java index 987dd775f86a..ab46e4b6295e 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -60,6 +61,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the URI. * @hide */ + @UnsupportedAppUsage public void setUri(String uri) { this.mUri = uri; } @@ -76,6 +78,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the version. * @hide */ + @UnsupportedAppUsage public void setVersion(int version) { this.mVersion = version; } @@ -92,6 +95,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI state. * @hide */ + @UnsupportedAppUsage public void setFullState(boolean fullState) { this.mFullState = fullState; } @@ -108,6 +112,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the RLMI list name. * @hide */ + @UnsupportedAppUsage public void setListName(String listName) { this.mListName = listName; } @@ -124,6 +129,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the subscription request ID. * @hide */ + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -140,6 +146,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription state. * @hide */ + @UnsupportedAppUsage public void setPresSubscriptionState(PresSubscriptionState presSubscriptionState) { this.mPresSubscriptionState = presSubscriptionState; } @@ -156,6 +163,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription expiration time. * @hide */ + @UnsupportedAppUsage public void setSubscriptionExpireTime(int subscriptionExpireTime) { this.mSubscriptionExpireTime = subscriptionExpireTime; } @@ -172,6 +180,7 @@ public class PresRlmiInfo implements Parcelable { * Sets the presence subscription terminated reason. * @hide */ + @UnsupportedAppUsage public void setSubscriptionTerminatedReason(String subscriptionTerminatedReason) { this.mSubscriptionTerminatedReason = subscriptionTerminatedReason; } @@ -180,6 +189,7 @@ public class PresRlmiInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ + @UnsupportedAppUsage public PresRlmiInfo(){}; /** @hide */ diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java index f7b7264fe528..83ba722fe2f1 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -45,6 +46,7 @@ public class PresServiceInfo implements Parcelable { * Gets the media type. * @hide */ + @UnsupportedAppUsage public int getMediaType() { return mMediaCap; } @@ -61,6 +63,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service ID. * @hide */ + @UnsupportedAppUsage public String getServiceId() { return mServiceID; } @@ -76,6 +79,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service description. * @hide */ + @UnsupportedAppUsage public String getServiceDesc() { return mServiceDesc; } @@ -92,6 +96,7 @@ public class PresServiceInfo implements Parcelable { * Gets the service version. * @hide */ + @UnsupportedAppUsage public String getServiceVer() { return mServiceVer; } diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java index 456b443a392a..5e4259297d74 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -32,6 +33,7 @@ public class PresSipResponse implements Parcelable { * Gets the Presence command ID. * @hide */ + @UnsupportedAppUsage public PresCmdId getCmdId() { return mCmdId; } @@ -40,6 +42,7 @@ public class PresSipResponse implements Parcelable { * Sets the Presence command ID. * @hide */ + @UnsupportedAppUsage public void setCmdId(PresCmdId cmdId) { this.mCmdId = cmdId; } @@ -48,6 +51,7 @@ public class PresSipResponse implements Parcelable { * Gets the request ID. * @hide */ + @UnsupportedAppUsage public int getRequestId() { return mRequestId; } @@ -56,6 +60,7 @@ public class PresSipResponse implements Parcelable { * Sets the request ID. * @hide */ + @UnsupportedAppUsage public void setRequestId(int requestId) { this.mRequestId = requestId; } @@ -64,6 +69,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP response code. * @hide */ + @UnsupportedAppUsage public int getSipResponseCode() { return mSipResponseCode; } @@ -72,6 +78,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code. * @hide */ + @UnsupportedAppUsage public void setSipResponseCode(int sipResponseCode) { this.mSipResponseCode = sipResponseCode; } @@ -82,6 +89,7 @@ public class PresSipResponse implements Parcelable { * code. * @hide */ + @UnsupportedAppUsage public String getReasonPhrase() { return mReasonPhrase; } @@ -90,6 +98,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP response code reason phrase. * @hide */ + @UnsupportedAppUsage public void setReasonPhrase(String reasonPhrase) { this.mReasonPhrase = reasonPhrase; } @@ -98,6 +107,7 @@ public class PresSipResponse implements Parcelable { * Gets the SIP retryAfter sec value. * @hide */ + @UnsupportedAppUsage public int getRetryAfter() { return mRetryAfter; } @@ -106,6 +116,7 @@ public class PresSipResponse implements Parcelable { * Sets the SIP retryAfter sec value * @hide */ + @UnsupportedAppUsage public void setRetryAfter(int retryAfter) { this.mRetryAfter = retryAfter; } @@ -114,6 +125,7 @@ public class PresSipResponse implements Parcelable { * Constructor for the PresSipResponse class. * @hide */ + @UnsupportedAppUsage public PresSipResponse(){}; /** @hide */ diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java index 872bc23ee9ab..bee928c3280a 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -77,6 +78,7 @@ public class PresSubscriptionState implements Parcelable { * Constructor for the PresSubscriptionState class. * @hide */ + @UnsupportedAppUsage public PresSubscriptionState() { }; /** @@ -92,6 +94,7 @@ public class PresSubscriptionState implements Parcelable { * Sets the Presence subscription state. * @hide */ + @UnsupportedAppUsage public void setPresSubscriptionState(int nPresSubscriptionState) { this.mPresSubscriptionState = nPresSubscriptionState; } diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java index e1867c55836b..7a47786b5af6 100644 --- a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java +++ b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java @@ -16,6 +16,7 @@ package com.android.ims.internal.uce.presence; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -39,6 +40,7 @@ public class PresTupleInfo implements Parcelable { * Sets the feature tag. * @hide */ + @UnsupportedAppUsage public void setFeatureTag(String featureTag) { this.mFeatureTag = featureTag; } @@ -54,6 +56,7 @@ public class PresTupleInfo implements Parcelable { * Sets the contact URI. * @hide */ + @UnsupportedAppUsage public void setContactUri(String contactUri) { this.mContactUri = contactUri; } @@ -70,6 +73,7 @@ public class PresTupleInfo implements Parcelable { * Sets the timestamp. * @hide */ + @UnsupportedAppUsage public void setTimestamp(String timestamp) { this.mTimestamp = timestamp; } @@ -78,6 +82,7 @@ public class PresTupleInfo implements Parcelable { * Constructor for the PresTupleInfo class. * @hide */ + @UnsupportedAppUsage public PresTupleInfo(){}; /** @hide */ diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 2c5732ad4e30..d28a16a16e5b 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -390,7 +390,7 @@ interface ITelephony { /** * Returns the neighboring cell information of the device. */ - List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg); + List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg, int targetSdk); int getCallState(); |