Merge changes from topics "breakdown-usage-by-uid", "notify-device-interaction" into udc-qpr-dev

* changes:
  Break down input device usage by uid
  Notify MetricsCollector of device interaction from Dispatcher

1 files changed, 4 insertions, 0 deletions

diff --git a/services/inputflinger/InputManager.cpp b/services/inputflinger/InputManager.cpp
index 863b4839be..1a9f47d934 100644
--- a/services/inputflinger/InputManager.cpp
+++ b/services/inputflinger/InputManager.cpp
@@ -127,6 +127,10 @@ InputProcessorInterface& InputManager::getProcessor() {
     return *mProcessor;
 }
 
+InputDeviceMetricsCollectorInterface& InputManager::getMetricsCollector() {
+    return *mCollector;
+}
+
 InputDispatcherInterface& InputManager::getDispatcher() {
     return *mDispatcher;
 }