Look up Connection by token
Currently, we are passing in the entire input channel in order to find
the corresponding connection. But if an input channel is uniquely
identified by the token, we should only have to pass in the token.
In some cases, we are even doing the circular lookup: find input channel
by token, then use inputchannel->token to find the corresponding
connection.
We should be able to unregisterInputChannel by token instead of by
inputchannel.
Bug: 142581626
Test: basic interaction with the device
Change-Id: Ie438c5136186f9dd14df6df08aaabeb35a336f05
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index af671e6..24b27b9 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -1038,7 +1038,7 @@
pokeUserActivityLocked(*eventEntry);
for (const InputTarget& inputTarget : inputTargets) {
- sp<Connection> connection = getConnectionLocked(inputTarget.inputChannel);
+ sp<Connection> connection = getConnectionLocked(inputTarget.inputChannel->getToken());
if (connection != nullptr) {
prepareDispatchCycleLocked(currentTime, connection, eventEntry, &inputTarget);
} else {
@@ -1126,7 +1126,7 @@
}
void InputDispatcher::resumeAfterTargetsNotReadyTimeoutLocked(
- nsecs_t newTimeout, const sp<InputChannel>& inputChannel) {
+ nsecs_t newTimeout, const sp<IBinder>& inputConnectionToken) {
if (newTimeout > 0) {
// Extend the timeout.
mInputTargetWaitTimeoutTime = now() + newTimeout;
@@ -1135,13 +1135,9 @@
mInputTargetWaitTimeoutExpired = true;
// Input state will not be realistic. Mark it out of sync.
- sp<Connection> connection = getConnectionLocked(inputChannel);
+ sp<Connection> connection = getConnectionLocked(inputConnectionToken);
if (connection != nullptr) {
- sp<IBinder> token = connection->inputChannel->getToken();
-
- if (token != nullptr) {
- removeWindowByTokenLocked(token);
- }
+ removeWindowByTokenLocked(inputConnectionToken);
if (connection->status == Connection::STATUS_NORMAL) {
CancelationOptions options(CancelationOptions::CANCEL_ALL_EVENTS,
@@ -1828,8 +1824,7 @@
}
// If the window's connection is not registered then keep waiting.
- sp<Connection> connection =
- getConnectionLocked(getInputChannelLocked(windowHandle->getToken()));
+ sp<Connection> connection = getConnectionLocked(windowHandle->getToken());
if (connection == nullptr) {
return StringPrintf("Waiting because the %s window's input channel is not "
"registered with the input dispatcher. The window may be in the "
@@ -2477,7 +2472,7 @@
void InputDispatcher::synthesizeCancelationEventsForInputChannelLocked(
const sp<InputChannel>& channel, const CancelationOptions& options) {
- sp<Connection> connection = getConnectionLocked(channel);
+ sp<Connection> connection = getConnectionLocked(channel->getToken());
if (connection == nullptr) {
return;
}
@@ -3571,10 +3566,8 @@
return false;
}
- sp<InputChannel> fromChannel = getInputChannelLocked(fromToken);
- sp<InputChannel> toChannel = getInputChannelLocked(toToken);
- sp<Connection> fromConnection = getConnectionLocked(fromChannel);
- sp<Connection> toConnection = getConnectionLocked(toChannel);
+ sp<Connection> fromConnection = getConnectionLocked(fromToken);
+ sp<Connection> toConnection = getConnectionLocked(toToken);
if (fromConnection != nullptr && toConnection != nullptr) {
fromConnection->inputState.copyPointerStateTo(toConnection->inputState);
CancelationOptions
@@ -3873,7 +3866,7 @@
{ // acquire lock
std::scoped_lock _l(mLock);
- sp<Connection> existingConnection = getConnectionLocked(inputChannel);
+ sp<Connection> existingConnection = getConnectionLocked(inputChannel->getToken());
if (existingConnection != nullptr) {
ALOGW("Attempted to register already registered input channel '%s'",
inputChannel->getName().c_str());
@@ -3948,7 +3941,7 @@
status_t InputDispatcher::unregisterInputChannelLocked(const sp<InputChannel>& inputChannel,
bool notify) {
- sp<Connection> connection = getConnectionLocked(inputChannel);
+ sp<Connection> connection = getConnectionLocked(inputChannel->getToken());
if (connection == nullptr) {
ALOGW("Attempted to unregister already unregistered input channel '%s'",
inputChannel->getName().c_str());
@@ -4056,14 +4049,14 @@
return std::nullopt;
}
-sp<Connection> InputDispatcher::getConnectionLocked(const sp<InputChannel>& inputChannel) {
- if (inputChannel == nullptr) {
+sp<Connection> InputDispatcher::getConnectionLocked(const sp<IBinder>& inputConnectionToken) {
+ if (inputConnectionToken == nullptr) {
return nullptr;
}
for (const auto& pair : mConnectionsByFd) {
- sp<Connection> connection = pair.second;
- if (connection->inputChannel->getToken() == inputChannel->getToken()) {
+ const sp<Connection>& connection = pair.second;
+ if (connection->inputChannel->getToken() == inputConnectionToken) {
return connection;
}
}
@@ -4171,17 +4164,16 @@
}
void InputDispatcher::doNotifyANRLockedInterruptible(CommandEntry* commandEntry) {
+ sp<IBinder> token =
+ commandEntry->inputChannel ? commandEntry->inputChannel->getToken() : nullptr;
mLock.unlock();
nsecs_t newTimeout =
- mPolicy->notifyANR(commandEntry->inputApplicationHandle,
- commandEntry->inputChannel ? commandEntry->inputChannel->getToken()
- : nullptr,
- commandEntry->reason);
+ mPolicy->notifyANR(commandEntry->inputApplicationHandle, token, commandEntry->reason);
mLock.lock();
- resumeAfterTargetsNotReadyTimeoutLocked(newTimeout, commandEntry->inputChannel);
+ resumeAfterTargetsNotReadyTimeoutLocked(newTimeout, token);
}
void InputDispatcher::doInterceptKeyBeforeDispatchingLockedInterruptible(