Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7c8672c authored by Olivier Bailly's avatar Olivier Bailly
Browse files

fix int vs. pointer mismatch in return statement. 

Add missing include header for compilation on x86 target.

Change-Id: I3651fb3be0178b888c5ada3d3754fb379b55a847
parent c7bc3d09

cmds/rawbu/backup.cpp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <utime.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <stdint.h>



#include <cutils/properties.h>

core/jni/android_util_AssetManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());