summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-05-12 21:20:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 21:20:15 +0000
commit0cf42ffbbef8737b239f03224b0c11782b5db0b2 (patch)
treef4b0b757e64e77850910a05c514790bdc7fabaad /rs
parent51cfdd622f8a9082c1081cf32eb60340db7eb0e8 (diff)
parentf76423062a06fec9757c65806b6a47bbf63883c4 (diff)
downloadframeworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.zip
frameworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.tar.gz
frameworks_base-0cf42ffbbef8737b239f03224b0c11782b5db0b2.tar.bz2
Merge "Fix API name based on API review" into mnc-dev
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/RenderScript.java6
1 files changed, 3 insertions, 3 deletions
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;
}
/**