diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-09-12 19:46:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-09-17 22:46:45 -0700 |
| commit | 7f590e25c76891c3839a282635b5932af23812df (patch) | |
| tree | 38ea385029903068f5e8753a0ab154026c7238de /runtime/gc/reference_processor.cc | |
| parent | 79bbbe2d79811d4e86486cb8bc2b49e9a2b3c0d9 (diff) | |
| download | android_art-7f590e25c76891c3839a282635b5932af23812df.tar.gz android_art-7f590e25c76891c3839a282635b5932af23812df.tar.bz2 android_art-7f590e25c76891c3839a282635b5932af23812df.zip | |
Restore some aosp/master changes lost in cherry-pick 7c438b19b71932ac8a44eff44f20744a01559c8d
Change-Id: Ic9fe8a235baac85efbdf748aeaddf98139558c4e
Diffstat (limited to 'runtime/gc/reference_processor.cc')
| -rw-r--r-- | runtime/gc/reference_processor.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc index 75de623585..bfaa2bb0cc 100644 --- a/runtime/gc/reference_processor.cc +++ b/runtime/gc/reference_processor.cc @@ -132,7 +132,6 @@ void ReferenceProcessor::ProcessReferences(bool concurrent, TimingLogger* timing if (concurrent) { StartPreservingReferences(self); } - soft_reference_queue_.ForwardSoftReferences(&PreserveSoftReferenceCallback, &process_references_args_); process_mark_stack_callback(arg); |