summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-02-14 23:41:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-14 23:41:24 +0000
commitb542e8e128178560b7e36d476890e66b4e5a69ff (patch)
tree6b62c7a21feb5ee1dd1c59acf11122707f1f5287 /rs
parentd35ceee732ad7172e1f7a4261c361591da260120 (diff)
parentbdb04f025ce34b0240f01961c43d8156a78e27a2 (diff)
downloadframeworks_base-b542e8e128178560b7e36d476890e66b4e5a69ff.zip
frameworks_base-b542e8e128178560b7e36d476890e66b4e5a69ff.tar.gz
frameworks_base-b542e8e128178560b7e36d476890e66b4e5a69ff.tar.bz2
am bdb04f02: am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit 'bdb04f025ce34b0240f01961c43d8156a78e27a2': Add hidden minor version ID for support lib workarounds.
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/RenderScript.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index a4a9070..89dba9f 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -99,6 +99,20 @@ public class RenderScript {
static File mCacheDir;
+ // this should be a monotonically increasing ID
+ // used in conjunction with the API version of a device
+ static final long sMinorID = 1;
+
+ /**
+ * Returns an identifier that can be used to identify a particular
+ * minor version of RS.
+ *
+ * @hide
+ */
+ public static long getMinorID() {
+ return sMinorID;
+ }
+
/**
* Sets the directory to use as a persistent storage for the
* renderscript object file cache.