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

Merge changes from topics "NotifyInputDevicesChangedArgs", "dump-from-inputmanager" into udc-dev am: d43a6541a3

Browse Source 
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:
Treehugger Robot
2023-04-14 01:15:50 +00:00
committed by Automerger Merge Worker
parent 18b70258c1 d43a6541a3
commit 8216bf7db1
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -485,17 +485,7 @@ void NativeInputManager::dump(std::string& dump) {
} }
dump += "\n"; dump += "\n";
mInputManager->getReader().dump(dump); mInputManager->dump(dump);
dump += "\n";
mInputManager->getBlocker().dump(dump);
dump += "\n";
mInputManager->getProcessor().dump(dump);
dump += "\n";
mInputManager->getDispatcher().dump(dump);
dump += "\n";
} }
bool NativeInputManager::checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) { 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) { void NativeInputManager::notifyInputDevicesChanged(const std::vector<InputDeviceInfo>& inputDevices) {
ATRACE_CALL(); ATRACE_CALL();
mInputManager->getBlocker().notifyInputDevicesChanged(inputDevices);
JNIEnv* env = jniEnv(); JNIEnv* env = jniEnv();
size_t count = inputDevices.size(); size_t count = inputDevices.size();