diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-07-09 12:54:32 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-07-10 10:50:04 -0700 |
| commit | 654dd48e2230e16bfaa225decce72b52642e2f78 (patch) | |
| tree | af06c5db6159159ffd701c0bbd43440e86ddf1fb /runtime/gc/heap.h | |
| parent | adce33da293b0eeaaf52673338770f22be71ca5d (diff) | |
| download | art-654dd48e2230e16bfaa225decce72b52642e2f78.zip art-654dd48e2230e16bfaa225decce72b52642e2f78.tar.gz art-654dd48e2230e16bfaa225decce72b52642e2f78.tar.bz2 | |
Improve the OOME fragmentation message.
Change-Id: I390d3622f8d572ec7e34ea6dff9e1e0936e81ac1
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index c9ea03e..07db169 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -194,7 +194,6 @@ class Heap { void CheckPreconditionsForAllocObject(mirror::Class* c, size_t byte_count) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void ThrowOutOfMemoryError(size_t byte_count, bool large_object_allocation); void RegisterNativeAllocation(JNIEnv* env, int bytes); void RegisterNativeFree(JNIEnv* env, int bytes); @@ -628,7 +627,7 @@ class Heap { size_t* usable_size) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void ThrowOutOfMemoryError(Thread* self, size_t byte_count, bool large_object_allocation) + void ThrowOutOfMemoryError(Thread* self, size_t byte_count, AllocatorType allocator_type) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); template <bool kGrow> |