OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd04724
)
Instead of aborting, just ignore tracked allocation calls.
author
Carl Shapiro
<cshapiro@google.com>
Tue, 18 May 2010 21:16:26 +0000
(14:16 -0700)
committer
Carl Shapiro
<cshapiro@google.com>
Tue, 18 May 2010 21:16:26 +0000
(14:16 -0700)
This fixes a crash in the 070-nio-buffer dalvik test.
Change-Id: If58895498d573408ed69b6b580c16b9e75e9c291
vm/alloc/Copying.c
patch
|
blob
|
history
diff --git
a/vm/alloc/Copying.c
b/vm/alloc/Copying.c
index
9c6a79b
..
846ba8a
100644
(file)
--- a/
vm/alloc/Copying.c
+++ b/
vm/alloc/Copying.c
@@
-776,13
+776,13
@@
size_t dvmHeapSourceGetNumHeaps(void)
bool dvmTrackExternalAllocation(size_t n)
{
- assert(!"implemented");
- return
fals
e;
+ /* do nothing */
+ return
tru
e;
}
void dvmTrackExternalFree(size_t n)
{
- assert(!"implemented");
+ /* do nothing */
}
size_t dvmGetExternalBytesAllocated(void)