Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7619a16 authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769 am: 1d526c11 

am: 92019fc3

Change-Id: Id9e7732b1f051b8ab37fc24a4867802e0eb1c870
parents 0a56b25b 92019fc3

config/hiddenapi-light-greylist.txt

+0 −90
Original line number Diff line number Diff line
@@ -4346,96 +4346,6 @@ Landroid/R$styleable;->View_visibility:I 
Landroid/R$styleable;->Window:[I

Landroid/R$styleable;->Window_windowBackground:I

Landroid/R$styleable;->Window_windowFrame:I

Landroid/renderscript/BaseObj;->mRS:Landroid/renderscript/RenderScript;

Landroid/renderscript/Element;->createUser(Landroid/renderscript/RenderScript;Landroid/renderscript/Element$DataType;)Landroid/renderscript/Element;

Landroid/renderscript/FileA3D$EntryType;->MESH:Landroid/renderscript/FileA3D$EntryType;

Landroid/renderscript/FileA3D$IndexEntry;->getEntryType()Landroid/renderscript/FileA3D$EntryType;

Landroid/renderscript/FileA3D$IndexEntry;->getObject()Landroid/renderscript/BaseObj;

Landroid/renderscript/FileA3D;->createFromResource(Landroid/renderscript/RenderScript;Landroid/content/res/Resources;I)Landroid/renderscript/FileA3D;

Landroid/renderscript/FileA3D;->getIndexEntry(I)Landroid/renderscript/FileA3D$IndexEntry;

Landroid/renderscript/Font$Style;->ITALIC:Landroid/renderscript/Font$Style;

Landroid/renderscript/Font;->create(Landroid/renderscript/RenderScript;Landroid/content/res/Resources;Ljava/lang/String;Landroid/renderscript/Font$Style;F)Landroid/renderscript/Font;

Landroid/renderscript/Matrix4f;->mMat:[F

Landroid/renderscript/Mesh$AllocationBuilder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/Mesh$AllocationBuilder;->addIndexSetAllocation(Landroid/renderscript/Allocation;Landroid/renderscript/Mesh$Primitive;)Landroid/renderscript/Mesh$AllocationBuilder;

Landroid/renderscript/Mesh$AllocationBuilder;->addIndexSetType(Landroid/renderscript/Mesh$Primitive;)Landroid/renderscript/Mesh$AllocationBuilder;

Landroid/renderscript/Mesh$AllocationBuilder;->addVertexAllocation(Landroid/renderscript/Allocation;)Landroid/renderscript/Mesh$AllocationBuilder;

Landroid/renderscript/Mesh$AllocationBuilder;->create()Landroid/renderscript/Mesh;

Landroid/renderscript/Mesh$Primitive;->POINT:Landroid/renderscript/Mesh$Primitive;

Landroid/renderscript/Mesh$Primitive;->TRIANGLE:Landroid/renderscript/Mesh$Primitive;

Landroid/renderscript/Mesh$TriangleMeshBuilder;-><init>(Landroid/renderscript/RenderScript;II)V

Landroid/renderscript/Mesh$TriangleMeshBuilder;->addTriangle(III)Landroid/renderscript/Mesh$TriangleMeshBuilder;

Landroid/renderscript/Mesh$TriangleMeshBuilder;->addVertex(FF)Landroid/renderscript/Mesh$TriangleMeshBuilder;

Landroid/renderscript/Mesh$TriangleMeshBuilder;->create(Z)Landroid/renderscript/Mesh;

Landroid/renderscript/Mesh;->getVertexAllocation(I)Landroid/renderscript/Allocation;

Landroid/renderscript/Program$BaseProgramBuilder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/Program$BaseProgramBuilder;->mConstantCount:I

Landroid/renderscript/Program$BaseProgramBuilder;->mConstants:[Landroid/renderscript/Type;

Landroid/renderscript/Program$BaseProgramBuilder;->mInputCount:I

Landroid/renderscript/Program$BaseProgramBuilder;->mInputs:[Landroid/renderscript/Element;

Landroid/renderscript/Program$BaseProgramBuilder;->mOutputCount:I

Landroid/renderscript/Program$BaseProgramBuilder;->mOutputs:[Landroid/renderscript/Element;

Landroid/renderscript/Program$BaseProgramBuilder;->mRS:Landroid/renderscript/RenderScript;

Landroid/renderscript/Program$BaseProgramBuilder;->mShader:Ljava/lang/String;

Landroid/renderscript/Program$BaseProgramBuilder;->mTextureCount:I

Landroid/renderscript/Program$TextureType;->TEXTURE_2D:Landroid/renderscript/Program$TextureType;

Landroid/renderscript/ProgramFragment$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramFragment$Builder;->create()Landroid/renderscript/ProgramFragment;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;->MODULATE:Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;->REPLACE:Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;->ALPHA:Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;->RGB:Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;->RGBA:Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramFragmentFixedFunction$Builder;->create()Landroid/renderscript/ProgramFragmentFixedFunction;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder;->setTexture(Landroid/renderscript/ProgramFragmentFixedFunction$Builder$EnvMode;Landroid/renderscript/ProgramFragmentFixedFunction$Builder$Format;I)Landroid/renderscript/ProgramFragmentFixedFunction$Builder;

Landroid/renderscript/ProgramFragmentFixedFunction$Builder;->setVaryingColor(Z)Landroid/renderscript/ProgramFragmentFixedFunction$Builder;

Landroid/renderscript/ProgramRaster$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramRaster$Builder;->create()Landroid/renderscript/ProgramRaster;

Landroid/renderscript/ProgramRaster$Builder;->setPointSpriteEnabled(Z)Landroid/renderscript/ProgramRaster$Builder;

Landroid/renderscript/ProgramStore$BlendDstFunc;->ONE:Landroid/renderscript/ProgramStore$BlendDstFunc;

Landroid/renderscript/ProgramStore$BlendDstFunc;->ONE_MINUS_SRC_ALPHA:Landroid/renderscript/ProgramStore$BlendDstFunc;

Landroid/renderscript/ProgramStore$BlendDstFunc;->ZERO:Landroid/renderscript/ProgramStore$BlendDstFunc;

Landroid/renderscript/ProgramStore$BlendSrcFunc;->ONE:Landroid/renderscript/ProgramStore$BlendSrcFunc;

Landroid/renderscript/ProgramStore$BlendSrcFunc;->SRC_ALPHA:Landroid/renderscript/ProgramStore$BlendSrcFunc;

Landroid/renderscript/ProgramStore$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramStore$Builder;->create()Landroid/renderscript/ProgramStore;

Landroid/renderscript/ProgramStore$Builder;->setBlendFunc(Landroid/renderscript/ProgramStore$BlendSrcFunc;Landroid/renderscript/ProgramStore$BlendDstFunc;)Landroid/renderscript/ProgramStore$Builder;

Landroid/renderscript/ProgramStore$Builder;->setDepthFunc(Landroid/renderscript/ProgramStore$DepthFunc;)Landroid/renderscript/ProgramStore$Builder;

Landroid/renderscript/ProgramStore$Builder;->setDepthMaskEnabled(Z)Landroid/renderscript/ProgramStore$Builder;

Landroid/renderscript/ProgramStore$Builder;->setDitherEnabled(Z)Landroid/renderscript/ProgramStore$Builder;

Landroid/renderscript/ProgramStore$DepthFunc;->ALWAYS:Landroid/renderscript/ProgramStore$DepthFunc;

Landroid/renderscript/ProgramStore$DepthFunc;->LESS:Landroid/renderscript/ProgramStore$DepthFunc;

Landroid/renderscript/ProgramStore;->BLEND_ALPHA_DEPTH_NONE(Landroid/renderscript/RenderScript;)Landroid/renderscript/ProgramStore;

Landroid/renderscript/ProgramVertex$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramVertex$Builder;->addInput(Landroid/renderscript/Element;)Landroid/renderscript/ProgramVertex$Builder;

Landroid/renderscript/ProgramVertex$Builder;->create()Landroid/renderscript/ProgramVertex;

Landroid/renderscript/ProgramVertexFixedFunction$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramVertexFixedFunction$Builder;->create()Landroid/renderscript/ProgramVertexFixedFunction;

Landroid/renderscript/ProgramVertexFixedFunction$Constants;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/ProgramVertexFixedFunction$Constants;->setProjection(Landroid/renderscript/Matrix4f;)V

Landroid/renderscript/ProgramVertexFixedFunction;->bindConstants(Landroid/renderscript/ProgramVertexFixedFunction$Constants;)V

Landroid/renderscript/RenderScript;->create(Landroid/content/Context;I)Landroid/renderscript/RenderScript;

Landroid/renderscript/RenderScript;->create(Landroid/content/Context;ILandroid/renderscript/RenderScript$ContextType;I)Landroid/renderscript/RenderScript;

Landroid/renderscript/RenderScript;->getMinorID()J

Landroid/renderscript/RenderScript;->mMessageCallback:Landroid/renderscript/RenderScript$RSMessageHandler;

Landroid/renderscript/RenderScript;->nScriptCCreate(Ljava/lang/String;Ljava/lang/String;[BI)J

Landroid/renderscript/RenderScript;->sPointerSize:I

Landroid/renderscript/RenderScript;->validate()V

Landroid/renderscript/RenderScriptCacheDir;->mCacheDir:Ljava/io/File;

Landroid/renderscript/RenderScriptCacheDir;->setupDiskCache(Ljava/io/File;)V

Landroid/renderscript/RenderScriptGL$SurfaceConfig;-><init>()V

Landroid/renderscript/RenderScriptGL$SurfaceConfig;->setDepth(II)V

Landroid/renderscript/RenderScriptGL;-><init>(Landroid/content/Context;Landroid/renderscript/RenderScriptGL$SurfaceConfig;)V

Landroid/renderscript/RenderScriptGL;->bindProgramRaster(Landroid/renderscript/ProgramRaster;)V

Landroid/renderscript/RenderScriptGL;->bindProgramStore(Landroid/renderscript/ProgramStore;)V

Landroid/renderscript/RenderScriptGL;->bindProgramVertex(Landroid/renderscript/ProgramVertex;)V

Landroid/renderscript/RenderScriptGL;->bindRootScript(Landroid/renderscript/Script;)V

Landroid/renderscript/RenderScriptGL;->setSurface(Landroid/view/SurfaceHolder;II)V

Landroid/renderscript/RSSurfaceView;-><init>(Landroid/content/Context;)V

Landroid/renderscript/RSSurfaceView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V

Landroid/renderscript/Script$Builder;-><init>(Landroid/renderscript/RenderScript;)V

Landroid/renderscript/Script$Builder;->mRS:Landroid/renderscript/RenderScript;

Landroid/security/Credentials;->convertToPem([Ljava/security/cert/Certificate;)[B

Landroid/security/Credentials;->getInstance()Landroid/security/Credentials;

Landroid/security/Credentials;->install(Landroid/content/Context;Ljava/lang/String;[B)V

rs/java/android/renderscript/BaseObj.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.renderscript;



import android.annotation.UnsupportedAppUsage;

import dalvik.system.CloseGuard;

import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -73,6 +74,7 @@ public class BaseObj { 
    final CloseGuard guard = CloseGuard.get();

    private boolean mDestroyed;

    private String mName;

    @UnsupportedAppUsage

    RenderScript mRS;



    /**

rs/java/android/renderscript/Element.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.renderscript;



import android.annotation.UnsupportedAppUsage;



/**

 * <p>An Element represents one item within an {@link

 * android.renderscript.Allocation}.  An Element is roughly equivalent to a C
@@ -1146,6 +1148,7 @@ public class Element extends BaseObj { 
     * @param dt The DataType for the new element.

     * @return Element

     */

    @UnsupportedAppUsage

    static Element createUser(RenderScript rs, DataType dt) {

        DataKind dk = DataKind.USER;

        boolean norm = false;

rs/java/android/renderscript/FileA3D.java

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.renderscript; 
import java.io.File;

import java.io.InputStream;



import android.annotation.UnsupportedAppUsage;

import android.content.res.AssetManager;

import android.content.res.Resources;
@@ -53,6 +54,7 @@ public class FileA3D extends BaseObj { 
        * @deprecated in API 16

        * RenderScript Mesh object

        **/

        @UnsupportedAppUsage

        MESH (1);



        int mID;
@@ -100,6 +102,7 @@ public class FileA3D extends BaseObj { 
        * @return type of a renderscript object the index entry

        *         describes

        */

        @UnsupportedAppUsage

        public EntryType getEntryType() {

            return mEntryType;

        }
@@ -109,6 +112,7 @@ public class FileA3D extends BaseObj { 
        * Used to load the object described by the index entry

        * @return base renderscript object described by the entry

        */

        @UnsupportedAppUsage

        public BaseObj getObject() {

            mRS.validate();

            BaseObj obj = internalCreate(mRS, this);
@@ -212,6 +216,7 @@ public class FileA3D extends BaseObj { 
    *

    * @return entry in the a3d file described by the index

    */

    @UnsupportedAppUsage

    public IndexEntry getIndexEntry(int index) {

        if(getIndexEntryCount() == 0 || index < 0 || index >= mFileEntries.length) {

            return null;
@@ -284,6 +289,7 @@ public class FileA3D extends BaseObj { 
    *

    * @return a3d file containing renderscript objects

    */

    @UnsupportedAppUsage

    static public FileA3D createFromResource(RenderScript rs, Resources res, int id) {



        rs.validate();

rs/java/android/renderscript/Font.java

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import java.util.Map; 


import android.os.Environment;



import android.annotation.UnsupportedAppUsage;

import android.content.res.AssetManager;

import android.content.res.Resources;
@@ -85,6 +86,7 @@ public class Font extends BaseObj { 
        /**

         * @deprecated in API 16

         */

        @UnsupportedAppUsage

        ITALIC,

        /**

         * @deprecated in API 16
@@ -236,6 +238,7 @@ public class Font extends BaseObj { 
     *

     * Returns default font if no match could be found.

     */

    @UnsupportedAppUsage

    static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) {

        String fileName = getFontFileName(familyName, fontStyle);

        String fontPath = Environment.getRootDirectory().getAbsolutePath();