diff options
| author | Yang Ni <yangni@google.com> | 2017-05-08 16:12:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-08 16:12:37 +0000 |
| commit | 26a5164479fee0c0be46b2b91ea9b5d892761bdc (patch) | |
| tree | 9fd0b2e67bc4d21d56a0ad08ee3d7f154f3f17b3 /rs | |
| parent | b9e1b02f72962c165d449625a18b4e243574de1c (diff) | |
| parent | fd9f0919956ab1cb41422f25ac00865214836d88 (diff) | |
Merge "Destroy Allocation right away on exception" am: 52bc790f61 am: a37bef769a
am: fd9f091995
Change-Id: Ie83694e722af77c7fc324b8b850e4308f093ab04
Diffstat (limited to 'rs')
| -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); } |