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

Commit b51678b9 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 7c34a3af: am 275e6140: am 0cf42ffb: Merge "Fix API name based on API review" into mnc-dev 

* commit '7c34a3af':
  Fix API name based on API review
parents 9478c343 7c34a3af

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -27739,7 +27739,7 @@ package android.renderscript { 
    method public final android.content.Context getApplicationContext();

    method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler();

    method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler();

    method public static long getMinorID();

    method public static long getMinorVersion();

    method public static void releaseAllContexts();

    method public void sendMessage(int, int[]);

    method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29762,7 +29762,7 @@ package android.renderscript { 
    method public final android.content.Context getApplicationContext();

    method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler();

    method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler();

    method public static long getMinorID();

    method public static long getMinorVersion();

    method public static void releaseAllContexts();

    method public void sendMessage(int, int[]);

    method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler);

rs/java/android/renderscript/RenderScript.java

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class RenderScript { 


    // this should be a monotonically increasing ID

    // used in conjunction with the API version of a device

    static final long sMinorID = 1;

    static final long sMinorVersion = 1;



    /**

     * Returns an identifier that can be used to identify a particular
@@ -140,8 +140,8 @@ public class RenderScript { 
     * @return The minor RenderScript version number

     *

     */

    public static long getMinorID() {

        return sMinorID;

    public static long getMinorVersion() {

        return sMinorVersion;

    }



    /**