diff options
| author | Jason Sams <jsams@google.com> | 2015-05-12 21:20:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 21:20:15 +0000 |
| commit | 0cf42ffbbef8737b239f03224b0c11782b5db0b2 (patch) | |
| tree | f4b0b757e64e77850910a05c514790bdc7fabaad | |
| parent | 51cfdd622f8a9082c1081cf32eb60340db7eb0e8 (diff) | |
| parent | f76423062a06fec9757c65806b6a47bbf63883c4 (diff) | |
| download | frameworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.zip frameworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.tar.gz frameworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.tar.bz2 | |
Merge "Fix API name based on API review" into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index dc2da17..0782b39 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27736,7 +27736,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); diff --git a/api/system-current.txt b/api/system-current.txt index a9e0f11..33b56c6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -29759,7 +29759,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); diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 4f10699..27f2cc8 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -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; } /** |