Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix static analyzer complaints"

Browse Source 
am: a3bde81205

Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
This commit is contained in:
George Burgess IV
2017-07-19 17:36:23 +00:00
committed by android-build-merger
parent 3a6a8b9baa a3bde81205
commit 3e0a8b1d2b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/AndroidRuntime.cpp
View File

@@ -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);

6
core/jni/android_view_MotionEvent.cpp
View File

@@ -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();
}