diff options
| author | Yang Ni <yangni@google.com> | 2017-05-08 16:22:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-08 16:22:04 +0000 |
| commit | 25f6c69fbb45c87437c40f94d10b55360aff948e (patch) | |
| tree | fcb0e6b151db5df363c83a175c2e02d6ebccf7cc /rs/java/android | |
| parent | daca7890bfa49956d22a08547a3a4c9e4700262a (diff) | |
| parent | 26a5164479fee0c0be46b2b91ea9b5d892761bdc (diff) | |
Merge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a am: fd9f091995
am: 26a5164479
Change-Id: I5017653d4a19b6a0e111f5ae5f0905cf7a5e7d2c
Diffstat (limited to 'rs/java/android')
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 05ad1615dc81..238bf0f5a335 100644 --- 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); } |