From: Hiroshi Yamauchi Date: Sat, 20 Dec 2014 00:02:07 +0000 (-0800) Subject: Pass the real capacity to CreateRosAlloc. X-Git-Tag: android-x86-6.0-r1~145^2~2^2~27^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=634d58a91ed636043feed600ca17c6c945a4fb20;p=android-x86%2Fart.git Pass the real capacity to CreateRosAlloc. (cherrypick commit 94c41dfcaf4bc131964ddd3013432841b07c3839) Bug: 18808732 Change-Id: Id65469c3deb70c9f750f89cf0e7606849b801a21 --- diff --git a/runtime/gc/space/rosalloc_space.cc b/runtime/gc/space/rosalloc_space.cc index 92c6f534c..518e8c078 100644 --- a/runtime/gc/space/rosalloc_space.cc +++ b/runtime/gc/space/rosalloc_space.cc @@ -351,8 +351,8 @@ void RosAllocSpace::Clear() { mark_bitmap_->Clear(); SetEnd(begin_ + starting_size_); delete rosalloc_; - rosalloc_ = CreateRosAlloc(mem_map_->Begin(), starting_size_, initial_size_, Capacity(), - low_memory_mode_); + rosalloc_ = CreateRosAlloc(mem_map_->Begin(), starting_size_, initial_size_, + NonGrowthLimitCapacity(), low_memory_mode_); SetFootprintLimit(footprint_limit); }