From d7c8672ccc8ccd1f99da60accc63d6817d41ac52 Mon Sep 17 00:00:00 2001
From: Olivier Bailly <olivier@google.com>
Date: Thu, 18 Nov 2010 14:43:36 -0800
Subject: [PATCH] fix int vs. pointer mismatch in return statement. Add missing
 include header for compilation on x86 target.

Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
---
 cmds/rawbu/backup.cpp                  | 1 +
 core/jni/android_util_AssetManager.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmds/rawbu/backup.cpp b/cmds/rawbu/backup.cpp
index c4fa7656f9967..9ea046d2e9a4e 100644
--- a/cmds/rawbu/backup.cpp
+++ b/cmds/rawbu/backup.cpp
@@ -14,6 +14,7 @@
 #include <utime.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <stdint.h>
 
 #include <cutils/properties.h>
 
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index c4056a44ee799..2528db1a45235 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -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());