From 16769947bdca62358d2fef60645b83b9aac8f12d Mon Sep 17 00:00:00 2001
From: Siarhei Vishniakou <svv@google.com>
Date: Mon, 8 Nov 2021 09:34:39 -0800
Subject: [PATCH] Add dump for UnwantedInteractionBlocker

The new stage that we are adding will be responsible for blocking
unwanted input interactions.

Bug: 198472780
Test: adb shell dumpsys input
Change-Id: I8e78d873adf866738cd3d7cd1beccebd905812dc
---
 services/core/jni/Android.bp                                  | 1 +
 .../core/jni/com_android_server_input_InputManagerService.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 95ef5f76b7651..99abf440910e0 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -103,6 +103,7 @@ cc_defaults {
         "libappfuse",
         "libbinder_ndk",
         "libbinder",
+        "libchrome",
         "libcutils",
         "libcrypto",
         "liblog",
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index df5fb2827a16c..8cb27e179c19e 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -457,6 +457,9 @@ void NativeInputManager::dump(std::string& dump) {
     mInputManager->getReader().dump(dump);
     dump += "\n";
 
+    mInputManager->getUnwantedInteractionBlocker().dump(dump);
+    dump += "\n";
+
     mInputManager->getClassifier().dump(dump);
     dump += "\n";
 
@@ -704,6 +707,7 @@ void NativeInputManager::ensureSpriteControllerLocked() REQUIRES(mLock) {
 
 void NativeInputManager::notifyInputDevicesChanged(const std::vector<InputDeviceInfo>& inputDevices) {
     ATRACE_CALL();
+    mInputManager->getUnwantedInteractionBlocker().notifyInputDevicesChanged(inputDevices);
     JNIEnv* env = jniEnv();
 
     size_t count = inputDevices.size();