summaryrefslogtreecommitdiff
path: root/core/jni/AndroidRuntime.cpp
diff options
context:
space:
mode:
authorScott Lobdell <slobdell@google.com>2020-11-16 12:06:52 -0800
committerJustin DeMartino <jjdemartino@google.com>2020-11-17 08:25:32 -0800
commitd3ff2de786af936a9af8739f5c98972804dd5823 (patch)
treeb7e582570fca298b4876aa354f668b9df334e67b /core/jni/AndroidRuntime.cpp
parentf2b9cf60566ebee53ce8453a093e964b60444c05 (diff)
parent5ba20685f9b25bcec335ed842f0da7f567cff5e9 (diff)
Merge SP1A.201116.001
Change-Id: I51f7864ca57206ba4034be7db7ae9f36d5c53f59
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
-rw-r--r--core/jni/AndroidRuntime.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index d46378c0fcd6..3f5f0d4d33de 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -106,6 +106,7 @@ extern int register_android_util_SeempLog(JNIEnv* env);
*/
extern int register_android_app_admin_SecurityLog(JNIEnv* env);
extern int register_android_content_AssetManager(JNIEnv* env);
+extern int register_android_util_CharsetUtils(JNIEnv* env);
extern int register_android_util_EventLog(JNIEnv* env);
extern int register_android_util_Log(JNIEnv* env);
extern int register_android_util_MemoryIntArray(JNIEnv* env);
@@ -1452,6 +1453,7 @@ static const RegJNIRec gRegJNI[] = {
REG_JNI(register_com_android_internal_os_RuntimeInit),
REG_JNI(register_com_android_internal_os_ZygoteInit_nativeZygoteInit),
REG_JNI(register_android_os_SystemClock),
+ REG_JNI(register_android_util_CharsetUtils),
REG_JNI(register_android_util_EventLog),
REG_JNI(register_android_util_Log),
REG_JNI(register_android_util_MemoryIntArray),