diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:10 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:23:10 -0500 |
| commit | 3442967571bacf5fee6631ebb4eb268b8b610696 (patch) | |
| tree | e03cabead71b9f06da22d595453cc058bd373182 /runtime/thread.cc | |
| parent | 773e16b98cb8ca2000eaeaf49f239f39ac51d562 (diff) | |
| parent | f9e3754e8a2f6244e037362c03db32d4244ecb2d (diff) | |
| download | art-3442967571bacf5fee6631ebb4eb268b8b610696.tar.gz art-3442967571bacf5fee6631ebb4eb268b8b610696.tar.bz2 art-3442967571bacf5fee6631ebb4eb268b8b610696.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:41 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 16f30cded9..f3b39c9d14 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -1602,7 +1602,11 @@ void Thread::Shutdown() { } } -Thread::Thread(bool daemon) : tls32_(daemon), wait_monitor_(nullptr), interrupted_(false) { +Thread::Thread(bool daemon) + : tls32_(daemon), + wait_monitor_(nullptr), + interrupted_(false), + can_call_into_java_(true) { wait_mutex_ = new Mutex("a thread wait mutex"); wait_cond_ = new ConditionVariable("a thread wait condition variable", *wait_mutex_); tlsPtr_.instrumentation_stack = new std::deque<instrumentation::InstrumentationStackFrame>; |