drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 764f08ad to master

Browse Source 
Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3
This commit is contained in:
Stephen Hines
2015-04-07 14:47:32 -07:00
parent 9e62d31fd1 764f08ad84
commit b6b17a575f
4 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rs/java/android/renderscript/RenderScript.java
View File

@ -16,7 +16,6 @@
package android.renderscript;
import java.io.File;
import java.lang.reflect.Method;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -129,8 +128,6 @@ public class RenderScript {
native void nContextInitToClient(long con);
native void nContextDeinitToClient(long con);
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;
@ -146,23 +143,6 @@ public class RenderScript {
return sMinorID;
}
/**
* Sets the directory to use as a persistent storage for the
* renderscript object file cache.
*
* @hide
* @param cacheDir A directory the current process can write to
*/
public static void setupDiskCache(File cacheDir) {
if (!sInitialized) {
Log.e(LOG_TAG, "RenderScript.setupDiskCache() called when disabled");
return;
}
// Defer creation of cache path to nScriptCCreate().
mCacheDir = cacheDir;
}
/**
* ContextType specifies the specific type of context to be created.
*