diff options
| author | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
| commit | 2e681c1b097883f5c327d3c1c77692ecab498a35 (patch) | |
| tree | 7dbf619f6a4e81fd615afc51f5a3b8a4441b167a /graphics/jni | |
| parent | 293fa718102353d7b103f10a7c0f580ba87b3a0f (diff) | |
| parent | 08289f55eae5c4127091360e862f78d57ae24c15 (diff) | |
| download | base-2e681c1b097883f5c327d3c1c77692ecab498a35.tar.gz | |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'graphics/jni')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 2856437df785..19521b06d63f 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -47,7 +47,7 @@ #include <gui/SurfaceTextureClient.h> #include <android_runtime/android_graphics_SurfaceTexture.h> -//#define LOG_API LOGE +//#define LOG_API ALOGE #define LOG_API(...) using namespace android; @@ -1345,13 +1345,13 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) jint result = -1; if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { - LOGE("ERROR: GetEnv failed\n"); + ALOGE("ERROR: GetEnv failed\n"); goto bail; } assert(env != NULL); if (registerFuncs(env) < 0) { - LOGE("ERROR: MediaPlayer native registration failed\n"); + ALOGE("ERROR: MediaPlayer native registration failed\n"); goto bail; } |