commit | d7c8672ccc8ccd1f99da60accc63d6817d41ac52 | [log] [tgz] |
---|---|---|
author | Olivier Bailly <olivier@google.com> | Thu Nov 18 14:43:36 2010 -0800 |
committer | Olivier Bailly <olivier@google.com> | Thu Nov 18 14:43:36 2010 -0800 |
tree | 9fa8486829c5f9db3f579e6410f161e459cb7acc | |
parent | c7bc3d09bda82c0641035966559b911785ccf90e [diff] [blame] |
fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target. Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index c4056a4..2528db1 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp
@@ -1296,7 +1296,7 @@ { AssetManager* am = assetManagerForJavaObject(env, clazz); if (am == NULL) { - return NULL; + return 0; } const ResTable& res(am->getResources());