am bd561cbf: am a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap...

* commit 'bd561cbffebbff1a8b17e031841ab2fcd2777cff':
  Trim pre-Zygote fork, fix under-estimate of heap limit.

diff --cc vm/alloc/HeapSource.cpp
index 2815577,cd2f4df..9904c6c
--- 1/vm/alloc/HeapSource.cpp
--- 2/vm/alloc/HeapSource.cpp
+++ b/vm/alloc/HeapSource.cpp
@@@ -677,10 -728,11 +699,11 @@@ size_t dvmHeapSourceGetValue(HeapSource
  
          switch (spec) {
          case HS_FOOTPRINT:
-             value = mspace_footprint(heap->msp);
+             value = heap->brk - heap->base;
+             assert(value == mspace_footprint(heap->msp));
              break;
          case HS_ALLOWED_FOOTPRINT:
 -            value = mspace_footprint_limit(heap->msp);
 +            value = mspace_max_allowed_footprint(heap->msp);
              break;
          case HS_BYTES_ALLOCATED:
              value = heap->bytesAllocated;

diff --cc vm/alloc/HeapSource.h
Simple merge