diff options
| -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 c4fa7656f996..9ea046d2e9a4 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 c4056a44ee79..2528db1a4523 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()); |