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

Commit c6c395b6 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Fix static analyzer complaints" am: a3bde812 

am: 3e0a8b1d

Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25
parents 263e8337 3e0a8b1d

core/jni/AndroidRuntime.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ void AndroidRuntime::start(const char* className, const Vector<String8>& options 
     * Start VM.  This thread becomes the main thread of the VM, and will

     * not return until the VM exits.

     */

    char* slashClassName = toSlashClassName(className);

    char* slashClassName = toSlashClassName(className != NULL ? className : "");

    jclass startClass = env->FindClass(slashClassName);

    if (startClass == NULL) {

        ALOGE("JavaVM unable to locate class '%s'\n", slashClassName);

core/jni/android_view_MotionEvent.cpp

+4 −2
Original line number Diff line number Diff line
@@ -345,8 +345,10 @@ static jlong android_view_MotionEvent_nativeInitialize(JNIEnv* env, jclass clazz 
        return 0;

    }



    MotionEvent* event = reinterpret_cast<MotionEvent*>(nativePtr);

    if (!event) {

    MotionEvent* event;

    if (nativePtr) {

        event = reinterpret_cast<MotionEvent*>(nativePtr);

    } else {

        event = new MotionEvent();

    }