diff options
| author | Ian Rogers <irogers@google.com> | 2013-08-13 17:07:05 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-08-13 17:28:30 -0700 |
| commit | 46963dff1d1592729ba1e8b274835bf6c80a50bd (patch) | |
| tree | c1eb3097cfd7b5e09be8913bf3e5823022543608 /vm/native/dalvik_system_VMRuntime.cpp | |
| parent | c8344fb97e20760892ba59e7ac4fde1487bdfd45 (diff) | |
| download | android_dalvik-46963dff1d1592729ba1e8b274835bf6c80a50bd.tar.gz android_dalvik-46963dff1d1592729ba1e8b274835bf6c80a50bd.tar.bz2 android_dalvik-46963dff1d1592729ba1e8b274835bf6c80a50bd.zip | |
If CheckJNI is enabled don't allow app workarounds
Change-Id: I2554bbb18439337d2ddbc066799c2450769c35cb
Diffstat (limited to 'vm/native/dalvik_system_VMRuntime.cpp')
| -rw-r--r-- | vm/native/dalvik_system_VMRuntime.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vm/native/dalvik_system_VMRuntime.cpp b/vm/native/dalvik_system_VMRuntime.cpp index f44f7d8ae..41d442068 100644 --- a/vm/native/dalvik_system_VMRuntime.cpp +++ b/vm/native/dalvik_system_VMRuntime.cpp @@ -192,9 +192,13 @@ static void Dalvik_dalvik_system_VMRuntime_setTargetSdkVersion(const u4* args, // Note that this value may be 0, meaning "current". int targetSdkVersion = args[1]; if (targetSdkVersion > 0 && targetSdkVersion <= 13 /* honeycomb-mr2 */) { - // TODO: running with CheckJNI should override this and force you to obey the strictest rules. - ALOGI("Turning on JNI app bug workarounds for target SDK version %i...", targetSdkVersion); - gDvmJni.workAroundAppJniBugs = true; + if (gDvmJni.useCheckJni) { + ALOGI("CheckJNI enabled: not enabling JNI app bug workarounds."); + } else { + ALOGI("Enabling JNI app bug workarounds for target SDK version %i...", + targetSdkVersion); + gDvmJni.workAroundAppJniBugs = true; + } } RETURN_VOID(); } |