diff options
| author | Olivier Bailly <olivier@google.com> | 2010-11-29 15:12:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-29 15:12:33 -0800 |
| commit | 997d15e1a6e4a74c69c03f164973b7ddd21c6fff (patch) | |
| tree | dd2bfc118a587fe2df72e465f2b1379c691e230d | |
| parent | a84a744bb1804d7817093c0ab96d9cbaae3916f0 (diff) | |
| parent | d7c8672ccc8ccd1f99da60accc63d6817d41ac52 (diff) | |
| download | frameworks_base-997d15e1a6e4a74c69c03f164973b7ddd21c6fff.zip frameworks_base-997d15e1a6e4a74c69c03f164973b7ddd21c6fff.tar.gz frameworks_base-997d15e1a6e4a74c69c03f164973b7ddd21c6fff.tar.bz2 | |
Merge "fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target."
| -rw-r--r-- | cmds/rawbu/backup.cpp | 1 | ||||
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmds/rawbu/backup.cpp b/cmds/rawbu/backup.cpp index c4fa765..9ea046d 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 c4056a4..2528db1 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()); |