diff options
| author | Chris Gross <chrisgross@google.com> | 2021-03-10 23:00:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-10 23:00:14 +0000 |
| commit | 1cb919df825afb10aaa5e796a7f4360be2d0ffd8 (patch) | |
| tree | 30edf79f5c62d947eb8086a5274ab28f847bce1a /core/jni/AndroidRuntime.cpp | |
| parent | 984b7be598827be9938ce00b8f550ad4836bf67a (diff) | |
| parent | 4edca1117cdcad002c57f24db04b833088f2439b (diff) | |
Merge changes from topic "SP1A.210222.001" into s-keystone-qcom-dev
* changes:
Adapt to rename of DisplayConfig to DisplayMode.
Moves assignDisplayIdLocked to the Layout class.
Removes import of deprecated com.android.ims.ImsException.
Remove duplicate definitions of stringToAdnStringField().
Stops enforcing uses_libs matching AndroidManifest.xml for SystemUI.
Revert "CamcorderProfiles: Add 8KUHD camcorder profile"
Merge SP1A.210222.001
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 1c4115ba9d65..a4b1f88deaf5 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -191,6 +191,7 @@ extern int register_com_android_internal_content_om_OverlayConfig(JNIEnv *env); extern int register_com_android_internal_net_NetworkUtilsInternal(JNIEnv* env); extern int register_com_android_internal_os_ClassLoaderFactory(JNIEnv* env); extern int register_com_android_internal_os_FuseAppLoop(JNIEnv* env); +extern int register_com_android_internal_os_KernelCpuBpfTracking(JNIEnv* env); extern int register_com_android_internal_os_KernelCpuTotalBpfMapReader(JNIEnv* env); extern int register_com_android_internal_os_KernelCpuUidBpfMapReader(JNIEnv *env); extern int register_com_android_internal_os_KernelSingleProcessCpuThreadReader(JNIEnv* env); @@ -1589,6 +1590,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_security_Scrypt), REG_JNI(register_com_android_internal_content_NativeLibraryHelper), REG_JNI(register_com_android_internal_os_FuseAppLoop), + REG_JNI(register_com_android_internal_os_KernelCpuBpfTracking), REG_JNI(register_com_android_internal_os_KernelCpuTotalBpfMapReader), REG_JNI(register_com_android_internal_os_KernelCpuUidBpfMapReader), REG_JNI(register_com_android_internal_os_KernelSingleUidTimeReader), |