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

Commit edea751f authored by Miao Wang's avatar Miao Wang Committed by Android Git Automerger
Browse files

am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception...

am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

* commit '1327fa9e':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
parents da656fd8 1327fa9e
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -1340,15 +1340,22 @@ public class Allocation extends BaseObj {

    private void copyTo(Object array, Element.DataType dt, int arrayLen) {
        Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");
        if (dt.mSize * arrayLen < mSize) {
            throw new RSIllegalArgumentException(
                "Size of output array cannot be smaller than size of allocation.");
        }
        mRS.validate();
        boolean usePadding = false;
        if (mAutoPadding && (mType.getElement().getVectorSize() == 3)) {
            usePadding = true;
        }
        if (usePadding) {
            if (dt.mSize * arrayLen < mSize / 4 * 3) {
                throw new RSIllegalArgumentException(
                    "Size of output array cannot be smaller than size of allocation.");
            }
        } else {
            if (dt.mSize * arrayLen < mSize) {
                throw new RSIllegalArgumentException(
                    "Size of output array cannot be smaller than size of allocation.");
            }
        }
        mRS.nAllocationRead(getID(mRS), array, dt, mType.mElement.mType.mSize, usePadding);
        Trace.traceEnd(RenderScript.TRACE_TAG);
    }