Fix Native tests for input are broken in postsubmit
For releaseChannel, if clear the token first then unregisterChannel.
It may access the null pointer while looking for the corresponding
window and input channel.
This would change test case to simply clear the channel and token.
So updateInfo would get a null token for testing if setInputWindow fine.
Bug: 117116942
Test: atest inputflinger_tests
Change-Id: I11853720795554e1d83dafb9f3df948b5ee7e90e
diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index e0e211f..0f987c3 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -444,7 +444,7 @@
}
virtual bool updateInfo() {
- mInfo.token = mServerChannel->getToken();
+ mInfo.token = mServerChannel ? mServerChannel->getToken() : nullptr;
mInfo.name = mName;
mInfo.layoutParamsFlags = 0;
mInfo.layoutParamsType = InputWindowInfo::TYPE_APPLICATION;
@@ -474,8 +474,8 @@
}
void releaseChannel() {
+ mServerChannel.clear();
InputWindowHandle::releaseChannel();
- mDispatcher->unregisterInputChannel(mServerChannel);
}
protected:
virtual bool handled() {