commit | 1f7d30770abf0c243e7f577df785ad256b8bfcb0 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Mon Feb 11 17:03:32 2013 -0800 |
committer | Dianne Hackborn <hackbod@google.com> | Mon Feb 11 17:03:32 2013 -0800 |
tree | 327b0df9968e164fa0bf3d88cdbd9b62f8cea6cd | |
parent | 681533e0005200a3e55782f7ffe8ef516c7099c3 [diff] |
Fix build. Change-Id: Iaace063eaa65af842effa3e0b481a0629db58e42
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 8a8b15f..785bf13 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp
@@ -685,9 +685,9 @@ jobject outValue, jboolean resolve) { - if (outValue == null) { + if (outValue == NULL) { jniThrowNullPointerException(env, "outValue"); - return null; + return NULL; } AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) {