commit 5bfcc23d65009e8285acfbe7f7b1e952d94ad0c7
author David Brazdil <dbrazdil@google.com> Thu Jan 25 19:53:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 25 19:53:13 2018 +0000
tree e28801fd505b9d4f1f2d89d2c202141aef50e7a2
parent a84db1edf04a0d7c93123528e90199a8f5cf1f3e
parent 4384b104a5a023535fc613d7f08564b681f164b6

Merge "Expose pending hidden API warning through VMRuntime"

runtime/native/dalvik_system_VMRuntime.cc

diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 400518d..57a429c 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -74,6 +74,10 @@
 static void VMRuntime_disableJitCompilation(JNIEnv*, jobject) {
 }
 
+static jboolean VMRuntime_hasUsedHiddenApi(JNIEnv*, jobject) {
+  return Runtime::Current()->HasPendingHiddenApiWarning() ? JNI_TRUE : JNI_FALSE;
+}
+
 static jobject VMRuntime_newNonMovableArray(JNIEnv* env, jobject, jclass javaElementClass,
                                             jint length) {
   ScopedFastNativeObjectAccess soa(env);
@@ -670,6 +674,7 @@
   NATIVE_METHOD(VMRuntime, clearGrowthLimit, "()V"),
   NATIVE_METHOD(VMRuntime, concurrentGC, "()V"),
   NATIVE_METHOD(VMRuntime, disableJitCompilation, "()V"),
+  NATIVE_METHOD(VMRuntime, hasUsedHiddenApi, "()Z"),
   NATIVE_METHOD(VMRuntime, getTargetHeapUtilization, "()F"),
   FAST_NATIVE_METHOD(VMRuntime, isDebuggerActive, "()Z"),
   FAST_NATIVE_METHOD(VMRuntime, isNativeDebuggable, "()Z"),