fix int vs. pointer mismatch in return statement.

Add missing include header for compilation on x86 target.

Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
This commit is contained in:
Olivier Bailly
2010-11-18 14:43:36 -08:00
parent c7bc3d09bd
commit d7c8672ccc
2 changed files with 2 additions and 1 deletions

View File

@@ -14,6 +14,7 @@
#include <utime.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <stdint.h>
#include <cutils/properties.h>

View File

@@ -1296,7 +1296,7 @@ static jint android_content_AssetManager_getArraySize(JNIEnv* env, jobject clazz
{
AssetManager* am = assetManagerForJavaObject(env, clazz);
if (am == NULL) {
return NULL;
return 0;
}
const ResTable& res(am->getResources());