Merge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a am: fd9f091995

am: 26a5164479 Change-Id: I5017653d4a19b6a0e111f5ae5f0905cf7a5e7d2c
2017-05-08 16:22:04 +00:00
parent daca7890bf 26a5164479
commit 25f6c69fbb
1 changed files with 1 additions and 0 deletions
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -2895,6 +2895,7 @@ public class Allocation extends BaseObj {
            mAllocationArray[0] = createTyped(rs, t, usage);
            if ((usage & USAGE_IO_INPUT) != 0) {
                if (numAlloc > MAX_NUMBER_IO_INPUT_ALLOC) {
+                    mAllocationArray[0].destroy();
                    throw new RSIllegalArgumentException("Exceeds the max number of Allocations allowed: " +
                                                         MAX_NUMBER_IO_INPUT_ALLOC);
                }