commit e14177d988722b5e9f3d2e8ed7ab533e322e8689
author Orion Hodson <oth@google.com> Tue Jul 02 20:37:51 2019 +0100
committer TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 22 16:34:03 2019 +0000
tree 5cbc39fd5faae5130c97dcafe1e92551109021a2
parent 77c90365f8908bf4739a29b33ed7a884c1fa92cd

Disable JNI native whitelist check

Stack walking technique to be revisited as it breaks with recent LLVM.

Bug: 136276414
Bug: 141662282
Bug: 142857837
Test: atest CtsHiddenApiBlacklistApi27TestCases \
            CtsHiddenApiBlacklistApi28TestCases \
            CtsHiddenApiBlacklistCurrentApiTestCases \
            CtsHiddenApiBlacklistDebugClassTestCases
Change-Id: I69d49bd5b0696a37bc82f7197243e361f4c6ce6e
Merged-In: I69d49bd5b0696a37bc82f7197243e361f4c6ce6e
(cherry picked from commit c1b34d49a0790db878685258dc46c0bfd37e4f37)

runtime/jni/jni_internal.cc

diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index 608cab7..b3ca17f 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -263,10 +263,13 @@
 // things not rendering correctly. E.g. b/16858794
 static constexpr bool kWarnJniAbort = false;
 
+// Disable native JNI checking pending stack walk re-evaluation (b/136276414).
+static constexpr bool kNativeJniCheckEnabled = false;
+
 template<typename T>
 ALWAYS_INLINE static bool ShouldDenyAccessToMember(T* member, Thread* self)
     REQUIRES_SHARED(Locks::mutator_lock_) {
-  if (IsWhitelistedNativeCaller()) {
+  if (kNativeJniCheckEnabled && IsWhitelistedNativeCaller()) {
     return false;
   }
   return hiddenapi::ShouldDenyAccessToMember(