diff options
| author | Steven Laver <lavers@google.com> | 2019-01-20 16:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-20 16:40:46 +0000 |
| commit | c470daee1cf372142e66d4786f98b157f284dacb (patch) | |
| tree | c118879b496f19919078294bd68a7867dc7e5d0f /core/jni/AndroidRuntime.cpp | |
| parent | be058067720e1688137c15e68d5c4e50c4d66904 (diff) | |
| parent | 67924d836712134f300f2952dad900daa5f3c98d (diff) | |
Merge changes from topic "QP1A.190107.001" into q-keystone-qcom-dev
* changes:
Clear verification completed flag if an optional verifier is used
telephony: hide added members in DisconnectCause
location: fix build errors
Update CarrierIdentifier constructors to match public API signature
remove duplicate 'data_connection_5g'
Move persist.debug.trace handling to frameworks
Merge QP1A.190107.001
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index b60942ea8403..cb65cc188622 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -103,6 +103,7 @@ extern int register_android_hardware_UsbDeviceConnection(JNIEnv *env); extern int register_android_hardware_UsbRequest(JNIEnv *env); extern int register_android_hardware_location_ActivityRecognitionHardware(JNIEnv* env); +extern int register_android_media_AudioEffectDescriptor(JNIEnv *env); extern int register_android_media_AudioRecord(JNIEnv *env); extern int register_android_media_AudioSystem(JNIEnv *env); extern int register_android_media_AudioTrack(JNIEnv *env); @@ -1058,12 +1059,18 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options if (rootDir == NULL) { rootDir = "/system"; if (!hasDir("/system")) { - LOG_FATAL("No root directory specified, and /android does not exist."); + LOG_FATAL("No root directory specified, and /system does not exist."); return; } setenv("ANDROID_ROOT", rootDir, 1); } + const char* runtimeRootDir = getenv("ANDROID_RUNTIME_ROOT"); + if (runtimeRootDir == NULL) { + LOG_FATAL("No runtime directory specified with ANDROID_RUNTIME_ROOT environment variable."); + return; + } + //const char* kernelHack = getenv("LD_ASSUME_KERNEL"); //ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack); @@ -1453,6 +1460,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_hardware_UsbDeviceConnection), REG_JNI(register_android_hardware_UsbRequest), REG_JNI(register_android_hardware_location_ActivityRecognitionHardware), + REG_JNI(register_android_media_AudioEffectDescriptor), REG_JNI(register_android_media_AudioSystem), REG_JNI(register_android_media_AudioRecord), REG_JNI(register_android_media_AudioTrack), |