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

am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev

Browse Source 
* commit '7fa25bc1269d3ba2db79f32acb17d80194cbadce':
  Fix IO_INPUT with 64-bit.
This commit is contained in:
Tim Murray
2014-08-19 21:07:42 +00:00
committed by Android Git Automerger
parent 07caa64de7 5e8e9c336f
commit d0080ee004
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rs/java/android/renderscript/Allocation.java
View File

@@ -1868,7 +1868,7 @@ public class Allocation extends BaseObj {
}
}
static void sendBufferNotification(int id) {
static void sendBufferNotification(long id) {
synchronized(mAllocationMap) {
Allocation a = mAllocationMap.get(new Long(id));

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

@@ -1118,7 +1118,12 @@ public class RenderScript {
}
if (msg == RS_MESSAGE_TO_CLIENT_NEW_BUFFER) {
Allocation.sendBufferNotification(subID);
if (mRS.nContextGetUserMessage(mRS.mContext, rbuf) !=
RS_MESSAGE_TO_CLIENT_NEW_BUFFER) {
throw new RSDriverException("Error processing message from RenderScript.");
}
long bufferID = ((long)rbuf[1] << 32L) + ((long)rbuf[0] & 0xffffffffL);
Allocation.sendBufferNotification(bufferID);
continue;
}