summaryrefslogtreecommitdiffstats
path: root/services/jni
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-09 18:35:44 +0000
committerSteve Block <steveblock@google.com>2012-01-09 21:36:22 +0000
commitec193dec4d9ca2cfc8295c4becfe950a906a15ed (patch)
treec93578b9568a1b9f5b7b4b3d20732857d4e3a6c4 /services/jni
parent5c17a820f9e46e0756c11795b3e6f89105f2f539 (diff)
downloadframeworks_base-ec193dec4d9ca2cfc8295c4becfe950a906a15ed.zip
frameworks_base-ec193dec4d9ca2cfc8295c4becfe950a906a15ed.tar.gz
frameworks_base-ec193dec4d9ca2cfc8295c4becfe950a906a15ed.tar.bz2
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519 Bug: 5449033 Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
Diffstat (limited to 'services/jni')
-rw-r--r--services/jni/onload.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/jni/onload.cpp b/services/jni/onload.cpp
index 286ae91..c7beb5f 100644
--- a/services/jni/onload.cpp
+++ b/services/jni/onload.cpp
@@ -46,7 +46,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
ALOGE("GetEnv failed!");
return result;
}
- LOG_ASSERT(env, "Could not retrieve the env!");
+ ALOG_ASSERT(env, "Could not retrieve the env!");
register_android_server_PowerManagerService(env);
register_android_server_InputApplicationHandle(env);