Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

Browse Source 
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
  AArch64: Use long for pointers in RS Java/JNI code
This commit is contained in:
Narayan Kamath
2014-02-10 13:45:15 +00:00
committed by Android Git Automerger
parent dd99d87a12 33a608a0a3
commit f152d95085
8 changed files with 96 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rs/java/android/renderscript/ScriptC.java
View File

@@ -38,7 +38,17 @@ public class ScriptC extends Script {
protected ScriptC(int id, RenderScript rs) {
super(id, rs);
}
/**
* Only intended for use by the generated derived classes.
*
* @param id
* @param rs
*
* @hide
*/
protected ScriptC(long id, RenderScript rs) {
super(id, rs);
}
/**
* Only intended for use by the generated derived classes.
*
@@ -49,7 +59,7 @@ public class ScriptC extends Script {
*/
protected ScriptC(RenderScript rs, Resources resources, int resourceID) {
super(0, rs);
int id = internalCreate(rs, resources, resourceID);
long id = internalCreate(rs, resources, resourceID);
if (id == 0) {
throw new RSRuntimeException("Loading of ScriptC script failed.");
}
@@ -63,7 +73,7 @@ public class ScriptC extends Script {
static String mCachePath;
private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID) {
private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) {
byte[] pgm;
int pgmLength;
InputStream is = resources.openRawResource(resourceID);