commit c48a09cce85cbaeeaa75f9697807773bb99487eb
author Yang Ni <yangni@google.com> Fri Apr 28 08:49:01 2017 -0700
committer Yang Ni <yangni@google.com> Fri May 05 15:32:34 2017 +0000
tree 0722af39d21016d290b73dc5f4e65105b7119b6b
parent 31fb17bbf92bcbd16222b072d508366ac883d50a

Destroy Allocation right away on exception

Bug: 28053584

To avoid holding the resource (surface) for too long.

Test: CTS on x86_64 emulator
Change-Id: I2fdec107c2a16b7dadbf78a9aee79c33423a3676

rs/java/android/renderscript/Allocation.java

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 05ad161..238bf0f 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -2895,6 +2895,7 @@
             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);
                 }