54bc281639
Refactored the code to eliminate potential deadlocks due to re-entrant calls from the policy into the dispatcher. Also added some plumbing that will be used to notify the framework about ANRs. Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
106 lines
3.0 KiB
C++
106 lines
3.0 KiB
C++
//
|
|
// Copyright 2010 The Android Open Source Project
|
|
//
|
|
// The input manager.
|
|
//
|
|
#define LOG_TAG "InputManager"
|
|
|
|
//#define LOG_NDEBUG 0
|
|
|
|
#include <cutils/log.h>
|
|
#include <ui/InputManager.h>
|
|
#include <ui/InputReader.h>
|
|
#include <ui/InputDispatcher.h>
|
|
|
|
namespace android {
|
|
|
|
InputManager::InputManager(
|
|
const sp<EventHubInterface>& eventHub,
|
|
const sp<InputReaderPolicyInterface>& readerPolicy,
|
|
const sp<InputDispatcherPolicyInterface>& dispatcherPolicy) {
|
|
mDispatcher = new InputDispatcher(dispatcherPolicy);
|
|
mReader = new InputReader(eventHub, readerPolicy, mDispatcher);
|
|
initialize();
|
|
}
|
|
|
|
InputManager::InputManager(
|
|
const sp<InputReaderInterface>& reader,
|
|
const sp<InputDispatcherInterface>& dispatcher) :
|
|
mReader(reader),
|
|
mDispatcher(dispatcher) {
|
|
initialize();
|
|
}
|
|
|
|
InputManager::~InputManager() {
|
|
stop();
|
|
}
|
|
|
|
void InputManager::initialize() {
|
|
mReaderThread = new InputReaderThread(mReader);
|
|
mDispatcherThread = new InputDispatcherThread(mDispatcher);
|
|
}
|
|
|
|
status_t InputManager::start() {
|
|
status_t result = mDispatcherThread->run("InputDispatcher", PRIORITY_URGENT_DISPLAY);
|
|
if (result) {
|
|
LOGE("Could not start InputDispatcher thread due to error %d.", result);
|
|
return result;
|
|
}
|
|
|
|
result = mReaderThread->run("InputReader", PRIORITY_URGENT_DISPLAY);
|
|
if (result) {
|
|
LOGE("Could not start InputReader thread due to error %d.", result);
|
|
|
|
mDispatcherThread->requestExit();
|
|
return result;
|
|
}
|
|
|
|
return OK;
|
|
}
|
|
|
|
status_t InputManager::stop() {
|
|
status_t result = mReaderThread->requestExitAndWait();
|
|
if (result) {
|
|
LOGW("Could not stop InputReader thread due to error %d.", result);
|
|
}
|
|
|
|
result = mDispatcherThread->requestExitAndWait();
|
|
if (result) {
|
|
LOGW("Could not stop InputDispatcher thread due to error %d.", result);
|
|
}
|
|
|
|
return OK;
|
|
}
|
|
|
|
status_t InputManager::registerInputChannel(const sp<InputChannel>& inputChannel) {
|
|
return mDispatcher->registerInputChannel(inputChannel);
|
|
}
|
|
|
|
status_t InputManager::unregisterInputChannel(const sp<InputChannel>& inputChannel) {
|
|
return mDispatcher->unregisterInputChannel(inputChannel);
|
|
}
|
|
|
|
void InputManager::getInputConfiguration(InputConfiguration* outConfiguration) const {
|
|
mReader->getCurrentInputConfiguration(outConfiguration);
|
|
}
|
|
|
|
int32_t InputManager::getScanCodeState(int32_t deviceId, int32_t deviceClasses,
|
|
int32_t scanCode) const {
|
|
return mReader->getCurrentScanCodeState(deviceId, deviceClasses, scanCode);
|
|
}
|
|
|
|
int32_t InputManager::getKeyCodeState(int32_t deviceId, int32_t deviceClasses,
|
|
int32_t keyCode) const {
|
|
return mReader->getCurrentKeyCodeState(deviceId, deviceClasses, keyCode);
|
|
}
|
|
|
|
int32_t InputManager::getSwitchState(int32_t deviceId, int32_t deviceClasses, int32_t sw) const {
|
|
return mReader->getCurrentSwitchState(deviceId, deviceClasses, sw);
|
|
}
|
|
|
|
bool InputManager::hasKeys(size_t numCodes, const int32_t* keyCodes, uint8_t* outFlags) const {
|
|
return mReader->hasKeys(numCodes, keyCodes, outFlags);
|
|
}
|
|
|
|
} // namespace android
|