diff options
| author | 2018-05-11 23:48:51 +0000 | |
|---|---|---|
| committer | 2018-05-11 23:48:51 +0000 | |
| commit | 6623bc389c43efc87668ce7465e19b195e765e22 (patch) | |
| tree | b55804542510f8592c1c5b9e522a16d35567b2f1 /runtime/oat_file_assistant.cc | |
| parent | 54c42cea2b73e664c36fc4efaa28a33aea39b97c (diff) | |
| parent | adc9086aac1f9442f5ec80cec5734909f0b0f262 (diff) | |
Merge "Revert "Revert "Do not load app image for class collisions"""
Diffstat (limited to 'runtime/oat_file_assistant.cc')
| -rw-r--r-- | runtime/oat_file_assistant.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 9c8b6512a7..7d69927ffb 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -1217,7 +1217,9 @@ bool OatFileAssistant::OatFileInfo::ClassLoaderContextIsOkay(ClassLoaderContext* return false; } - bool result = context->VerifyClassLoaderContextMatch(file->GetClassLoaderContext()); + + const bool result = context->VerifyClassLoaderContextMatch(file->GetClassLoaderContext()) != + ClassLoaderContext::VerificationResult::kMismatch; if (!result) { VLOG(oat) << "ClassLoaderContext check failed. Context was " << file->GetClassLoaderContext() |