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

Commit ccf9d10b authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Hide and delete some code that should not be public." into honeycomb

parents 74ab5119 67e3d206

api/current.xml

+0 −205
Original line number Diff line number Diff line
@@ -170972,49 +170972,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="bindAllocation"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="va" type="android.renderscript.Allocation">

</parameter>

<parameter name="slot" type="int">

</parameter>

</method>

<method name="invoke"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="slot" type="int">

</parameter>

</method>

<method name="invoke"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="slot" type="int">

</parameter>

<parameter name="v" type="android.renderscript.FieldPacker">

</parameter>

</method>

<method name="setTimeZone"

 return="void"

 abstract="false"
@@ -171028,122 +170985,6 @@ 
<parameter name="timeZone" type="java.lang.String">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="float">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="double">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="int">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="long">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="boolean">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="o" type="android.renderscript.BaseObj">

</parameter>

</method>

<method name="setVar"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="index" type="int">

</parameter>

<parameter name="v" type="android.renderscript.FieldPacker">

</parameter>

</method>

<field name="MAX_SLOT"

 type="int"

 transient="false"

 volatile="false"

 value="16"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="Script.Builder"

 extends="java.lang.Object"
@@ -171267,26 +171108,6 @@ 
>

</field>

</class>

<class name="Script.Invokable"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="execute"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="ScriptC"

 extends="android.renderscript.Script"

 abstract="false"
@@ -171295,32 +171116,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<constructor name="ScriptC"

 type="android.renderscript.ScriptC"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="id" type="int">

</parameter>

<parameter name="rs" type="android.renderscript.RenderScript">

</parameter>

</constructor>

<constructor name="ScriptC"

 type="android.renderscript.ScriptC"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="rs" type="android.renderscript.RenderScript">

</parameter>

<parameter name="resources" type="android.content.res.Resources">

</parameter>

<parameter name="resourceID" type="int">

</parameter>

</constructor>

</class>

<class name="Short2"

 extends="java.lang.Object"

graphics/java/android/renderscript/Script.java

+80 −22
Original line number Diff line number Diff line
@@ -20,32 +20,25 @@ package android.renderscript; 
 *

 **/

public class Script extends BaseObj {

    public static final int MAX_SLOT = 16;



    boolean mIsRoot;

    Type[] mTypes;

    boolean[] mWritable;

    Invokable[] mInvokables;



    public static class Invokable {

        RenderScript mRS;

        Script mScript;

        int mSlot;

        String mName;



        Invokable() {

            mSlot = -1;

        }



        public void execute() {

            mRS.nScriptInvoke(mScript.getID(), mSlot);

        }

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param slot

     */

    protected void invoke(int slot) {

        mRS.nScriptInvoke(getID(), slot);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param slot

     * @param v

     */

    protected void invoke(int slot, FieldPacker v) {

        if (v != null) {

            mRS.nScriptInvokeV(getID(), slot, v.getData());
@@ -59,6 +52,15 @@ public class Script extends BaseObj { 
        super(id, rs);

    }





    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param va

     * @param slot

     */

    public void bindAllocation(Allocation va, int slot) {

        mRS.validate();

        if (va != null) {
@@ -68,30 +70,86 @@ public class Script extends BaseObj { 
        }

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, float v) {

        mRS.nScriptSetVarF(getID(), index, v);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, double v) {

        mRS.nScriptSetVarD(getID(), index, v);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, int v) {

        mRS.nScriptSetVarI(getID(), index, v);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, long v) {

        mRS.nScriptSetVarJ(getID(), index, v);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, boolean v) {

        mRS.nScriptSetVarI(getID(), index, v ? 1 : 0);

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param o

     */

    public void setVar(int index, BaseObj o) {

        mRS.nScriptSetVarObj(getID(), index, (o == null) ? 0 : o.getID());

    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

     * @param v

     */

    public void setVar(int index, FieldPacker v) {

        mRS.nScriptSetVarV(getID(), index, v.getData());

    }

graphics/java/android/renderscript/ScriptC.java

+18 −0
Original line number Diff line number Diff line
@@ -35,10 +35,28 @@ import java.lang.reflect.Modifier; 
public class ScriptC extends Script {

    private static final String TAG = "ScriptC";



    /**

     * @hide

     *

     * Only intended for use by the generated derived classes.

     *

     * @param id

     * @param rs

     */

    protected ScriptC(int id, RenderScript rs) {

        super(id, rs);

    }



    /**

     * @hide

     *

     * Only intended for use by the generated derived classes.

     *

     *

     * @param rs

     * @param resources

     * @param resourceID

     */

    protected ScriptC(RenderScript rs, Resources resources, int resourceID) {

        super(0, rs);

        int id = internalCreate(rs, resources, resourceID);