diff options
| author | Alec Mouri <alecmouri@google.com> | 2020-05-10 05:17:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-10 05:17:32 +0000 |
| commit | 151365a4614a5e5637f494da9cfed27d3a0e13bd (patch) | |
| tree | dc7ac71bd1b4d901f99aa00d9b234a2ffbb9e542 /core/jni/AndroidRuntime.cpp | |
| parent | 1be04e0cac2301513969674ad8243012f8a0f3d1 (diff) | |
| parent | 00f681a5827512248c79180a5fdb364f6140a660 (diff) | |
Merge "Dispatch refresh rate callbacks from DMS" into rvc-dev am: 00f681a582
Change-Id: I193dfe7532893c3675d074aa00078ab0885095c3
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 6fcaddf34322..a420ba67868f 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -18,39 +18,37 @@ #define LOG_TAG "AndroidRuntime" #define LOG_NDEBUG 1 -#include <android_runtime/AndroidRuntime.h> - #include <android-base/macros.h> #include <android-base/properties.h> #include <android/graphics/jni_runtime.h> +#include <android_runtime/AndroidRuntime.h> +#include <assert.h> #include <binder/IBinder.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> -#include <utils/Log.h> -#include <utils/misc.h> -#include <utils/Trace.h> #include <binder/Parcel.h> -#include <utils/threads.h> +#include <bionic/malloc.h> #include <cutils/properties.h> -#include <server_configurable_flags/get_flags.h> - -#include "jni.h" +#include <dirent.h> +#include <dlfcn.h> #include <nativehelper/JNIHelp.h> #include <nativehelper/JniInvocation.h> -#include "android_util_Binder.h" - -#include <stdio.h> +#include <server_configurable_flags/get_flags.h> #include <signal.h> +#include <stdio.h> #include <sys/stat.h> #include <sys/types.h> -#include <signal.h> -#include <dirent.h> -#include <assert.h> -#include <bionic/malloc.h> +#include <utils/Log.h> +#include <utils/Trace.h> +#include <utils/misc.h> +#include <utils/threads.h> #include <string> #include <vector> +#include "android_util_Binder.h" +#include "jni.h" + using namespace android; using android::base::GetProperty; @@ -78,6 +76,7 @@ extern int register_android_hardware_camera2_CameraMetadata(JNIEnv *env); extern int register_android_hardware_camera2_legacy_LegacyCameraDevice(JNIEnv *env); extern int register_android_hardware_camera2_legacy_PerfMeasurement(JNIEnv *env); extern int register_android_hardware_camera2_DngCreator(JNIEnv *env); +extern int register_android_hardware_display_DisplayManagerGlobal(JNIEnv* env); extern int register_android_hardware_HardwareBuffer(JNIEnv *env); extern int register_android_hardware_SensorManager(JNIEnv *env); extern int register_android_hardware_SerialPort(JNIEnv *env); @@ -1519,6 +1518,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_hardware_camera2_legacy_LegacyCameraDevice), REG_JNI(register_android_hardware_camera2_legacy_PerfMeasurement), REG_JNI(register_android_hardware_camera2_DngCreator), + REG_JNI(register_android_hardware_display_DisplayManagerGlobal), REG_JNI(register_android_hardware_HardwareBuffer), REG_JNI(register_android_hardware_SensorManager), REG_JNI(register_android_hardware_SerialPort), |