summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2020-12-04 15:50:30 +0000
committermosimchah <mosimchah@gmail.com>2021-03-04 18:52:35 -0500
commit6c76d2e2e62cd149a87b4889257c81db2100e548 (patch)
tree0e24d01aacb1d27d7fcf12da13334bd67d7f26ec
parent91e929eb438bb00ffb8570cb9d58ae7d4815f6b4 (diff)
Add SafetyNet logging to JNI::NewStringUTF.q10.0
(cherry picked from commit ed4b3e0958d3de6a92d82abb9f81e49e84d5c673) Test: blueline-userdebug boots. Bug: 172655291 Merged-In: I653db8be0c0a45302f0d1c54285c02d2d052a9f4 Change-Id: I653db8be0c0a45302f0d1c54285c02d2d052a9f4 (cherry picked from commit 69fc841b8460943c2b2224f61585942cbc9f3f40)
-rw-r--r--runtime/jni/jni_internal.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index 13c65107ee..1055057fc7 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -17,6 +17,7 @@
#include "jni_internal.h"
#include <cstdarg>
+#include <log/log.h>
#include <memory>
#include <mutex>
#include <utility>
@@ -2078,6 +2079,7 @@ class JNI {
/*bad=*/ []() { return true; }); // Abort processing and return 0 for bad characters.
if (UNLIKELY(utf8_length != 0u && utf16_length == 0u)) {
// VisitModifiedUtf8Chars() aborted for a bad character.
+ android_errorWriteLog(0x534e4554, "172655291"); // Report to SafetyNet.
// Report the error to logcat but avoid too much spam.
static const uint64_t kMinDelay = UINT64_C(10000000000); // 10s
static std::atomic<uint64_t> prev_bad_input_time(UINT64_C(0));