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

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

Merge "unhide functions used by reflected files for SDK." into honeycomb

parents 1f6e37ef 21b4103e

api/current.xml

+207 −1
Original line number Diff line number Diff line
@@ -167355,6 +167355,38 @@ 
<parameter name="dimX" type="int">

</parameter>

</method>

<method name="setFromFieldPacker"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

</method>

<method name="setFromFieldPacker"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

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

</parameter>

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

</parameter>

</method>

<method name="syncAll"

 return="void"

 abstract="false"
@@ -173115,6 +173147,49 @@ 
 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"
@@ -173128,6 +173203,111 @@ 
<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>

</class>

<class name="Script.Builder"

 extends="java.lang.Object"
@@ -173259,6 +173439,32 @@ 
 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"
@@ -260288,7 +260494,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

graphics/java/android/renderscript/Allocation.java

+2 −6
Original line number Diff line number Diff line
@@ -239,15 +239,13 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     *

     * This is only intended to be used by auto-generate code reflected from the

     * renderscript script files.

     *

     * @param xoff

     * @param fp

     */

    public void setOneElement(int xoff, FieldPacker fp) {

    public void setFromFieldPacker(int xoff, FieldPacker fp) {

        int eSize = mType.mElement.getSizeBytes();

        final byte[] data = fp.getData();
@@ -262,8 +260,6 @@ public class Allocation extends BaseObj { 




    /**

     * @hide

     *

     * This is only intended to be used by auto-generate code reflected from the

     * renderscript script files.

     *
@@ -271,7 +267,7 @@ public class Allocation extends BaseObj { 
     * @param component_number

     * @param fp

     */

    public void setOneComponent(int xoff, int component_number, FieldPacker fp) {

    public void setFromFieldPacker(int xoff, int component_number, FieldPacker fp) {

        if (component_number >= mType.mElement.mElements.length) {

            throw new RSIllegalArgumentException("Component_number " + component_number + " out of range.");

        }

graphics/java/android/renderscript/Script.java

+0 −20
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ package android.renderscript; 
 **/

public class Script extends BaseObj {

    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param slot
@@ -32,8 +30,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param slot
@@ -54,8 +50,6 @@ public class Script extends BaseObj { 




    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param va
@@ -71,8 +65,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -83,8 +75,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -95,8 +85,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -107,8 +95,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -119,8 +105,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -131,8 +115,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index
@@ -143,8 +125,6 @@ public class Script extends BaseObj { 
    }



    /**

     * @hide

     *

     * Only intended for use by generated reflected code.

     *

     * @param index

graphics/java/android/renderscript/ScriptC.java

+0 −4
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ public class ScriptC extends Script { 
    private static final String TAG = "ScriptC";



    /**

     * @hide

     *

     * Only intended for use by the generated derived classes.

     *

     * @param id
@@ -48,8 +46,6 @@ public class ScriptC extends Script { 
    }



    /**

     * @hide

     *

     * Only intended for use by the generated derived classes.

     *

     *