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

Make InputApplicationInfo as a part of InputApplicationHandle (2/2)

Browse Source 
InputWindowHandle::updateInfo would also call
InputApplicationHandle::updateInfo that may access the null pointer if the
focus application changed in same time.

- To replace allocated mInfo in updateInfo(), make it as an object
  member variable of InputApplicationHandle.

Bug: 128930899
Test: atest inputflinger_tests
Change-Id: I7494527be8ae7e76bea672c3dc33380aef07b057
This commit is contained in:
Arthur Hung
2019-03-20 17:04:26 +08:00
parent d4b81682e1
commit e7dc501719
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_hardware_input_InputApplicationHandle.cpp
View File

@@ -56,30 +56,25 @@ bool NativeInputApplicationHandle::updateInfo() {
JNIEnv* env = AndroidRuntime::getJNIEnv();
jobject obj = env->NewLocalRef(mObjWeak);
if (!obj) {
releaseInfo();
return false;
}
if (!mInfo) {
mInfo = new InputApplicationInfo();
}
mInfo.name = getStringField(env, obj, gInputApplicationHandleClassInfo.name, "<null>");
mInfo->name = getStringField(env, obj, gInputApplicationHandleClassInfo.name, "<null>");
mInfo->dispatchingTimeout = env->GetLongField(obj,
mInfo.dispatchingTimeout = env->GetLongField(obj,
gInputApplicationHandleClassInfo.dispatchingTimeoutNanos);
jobject tokenObj = env->GetObjectField(obj,
gInputApplicationHandleClassInfo.token);
if (tokenObj) {
mInfo->token = ibinderForJavaObject(env, tokenObj);
mInfo.token = ibinderForJavaObject(env, tokenObj);
env->DeleteLocalRef(tokenObj);
} else {
mInfo->token.clear();
mInfo.token.clear();
}
env->DeleteLocalRef(obj);
return true;
return mInfo.token.get() != nullptr;
}