Merge changes from topics "NotifyInputDevicesChangedArgs", "dump-from-inputmanager" into udc-dev am: d43a6541a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22496791 Change-Id: I812e553dcfd6ea86d3a7a0871cb900228bfd89d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -485,17 +485,7 @@ void NativeInputManager::dump(std::string& dump) {
|
||||
}
|
||||
dump += "\n";
|
||||
|
||||
mInputManager->getReader().dump(dump);
|
||||
dump += "\n";
|
||||
|
||||
mInputManager->getBlocker().dump(dump);
|
||||
dump += "\n";
|
||||
|
||||
mInputManager->getProcessor().dump(dump);
|
||||
dump += "\n";
|
||||
|
||||
mInputManager->getDispatcher().dump(dump);
|
||||
dump += "\n";
|
||||
mInputManager->dump(dump);
|
||||
}
|
||||
|
||||
bool NativeInputManager::checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) {
|
||||
@@ -760,7 +750,6 @@ void NativeInputManager::ensureSpriteControllerLocked() REQUIRES(mLock) {
|
||||
|
||||
void NativeInputManager::notifyInputDevicesChanged(const std::vector<InputDeviceInfo>& inputDevices) {
|
||||
ATRACE_CALL();
|
||||
mInputManager->getBlocker().notifyInputDevicesChanged(inputDevices);
|
||||
JNIEnv* env = jniEnv();
|
||||
|
||||
size_t count = inputDevices.size();
|
||||
|
||||
Reference in New Issue
Block a user