Minor fixes.
Fix a crash when shutting down if a daemon thread suspended while holding the
heap lock. For some reason, presumably involving extra daemon threads, CTS hits
this a lot.
Silently ignore a couple of dalvikvm options for backwards compatibility. This
makes CTS less noisy.
Remove redundant parentheses that would make it easy for us to introduce a ==/=
bug.
Change-Id: Id44eab29ce393a85585459c280ad47c5a5c749b9
diff --git a/src/dalvik_system_DexFile.cc b/src/dalvik_system_DexFile.cc
index de3e6d6..a14f124 100644
--- a/src/dalvik_system_DexFile.cc
+++ b/src/dalvik_system_DexFile.cc
@@ -144,7 +144,7 @@
static const DexFile* toDexFile(JNIEnv* env, int dex_file_address) {
const DexFile* dex_file = reinterpret_cast<const DexFile*>(static_cast<uintptr_t>(dex_file_address));
- if ((dex_file == NULL)) {
+ if (dex_file == NULL) {
jniThrowNullPointerException(env, "dex_file == null");
}
return dex_file;