Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 265858ca authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "Fix IO_INPUT with 64-bit." into lmp-dev

parents 73f84480 b730d866

rs/java/android/renderscript/Allocation.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1868,7 +1868,7 @@ public class Allocation extends BaseObj { 
        }

        }

    }

    }





    static void sendBufferNotification(int id) {

    static void sendBufferNotification(long id) {

        synchronized(mAllocationMap) {

        synchronized(mAllocationMap) {

            Allocation a = mAllocationMap.get(new Long(id));

            Allocation a = mAllocationMap.get(new Long(id));

rs/java/android/renderscript/RenderScript.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -1156,7 +1156,12 @@ public class RenderScript { 
                }

                }





                if (msg == RS_MESSAGE_TO_CLIENT_NEW_BUFFER) {

                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;

                    continue;

                }

                }