[activity][input-pipeline] Report activity from TouchInjectorHandler

Test: fx test input_pipeline_lib_tests
Test: fx test touch-input-test-ip
Multiply: touch-input-test-ip
Bug: 103837
Change-Id: I5213d930c2a5c97f86aa0d76249e18d815829676
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/706318
Reviewed-by: Mukesh Agrawal <[email protected]>
Commit-Queue: Caroline Liu <[email protected]>

Author: caroqliu

src/ui/lib/input_pipeline/src/touch_injector_handler.rs

@@ -12,6 +12,7 @@ use {
     async_trait::async_trait,
     async_utils::hanging_get::client::HangingGetStream,
     fidl::endpoints::create_proxy,
+    fidl_fuchsia_input_interaction_observation as interaction_observation,
     fidl_fuchsia_ui_pointerinjector as pointerinjector,
     fidl_fuchsia_ui_pointerinjector_configuration as pointerinjector_config,
     fuchsia_component::client::connect_to_protocol,
@@ -46,6 +47,9 @@ pub struct TouchInjectorHandler {
 
     /// The FIDL proxy used to get configuration details for pointer injection.
     configuration_proxy: pointerinjector_config::SetupProxy,
+
+    /// The FIDL proxy used to report touch activity to the activity service.
+    aggregator_proxy: interaction_observation::AggregatorProxy,
 }
 
 #[derive(Debug)]
@@ -88,6 +92,11 @@ impl UnhandledInputHandler for TouchInjectorHandler {
                     fx_log_err!("{}", e);
                 }
 
+                // Report the event to the Activity Service.
+                if let Err(e) = self.report_touch_activity(event_time).await {
+                    fx_log_err!("report_touch_activity failed: {}", e);
+                }
+
                 // Consume the input event.
                 vec![input_device::InputEvent::from(unhandled_input_event).into_handled()]
             }
@@ -111,8 +120,15 @@ impl TouchInjectorHandler {
     pub async fn new(display_size: Size) -> Result<Rc<Self>, Error> {
         let configuration_proxy = connect_to_protocol::<pointerinjector_config::SetupMarker>()?;
         let injector_registry_proxy = connect_to_protocol::<pointerinjector::RegistryMarker>()?;
+        let aggregator_proxy = connect_to_protocol::<interaction_observation::AggregatorMarker>()?;
 
-        Self::new_handler(configuration_proxy, injector_registry_proxy, display_size).await
+        Self::new_handler(
+            aggregator_proxy,
+            configuration_proxy,
+            injector_registry_proxy,
+            display_size,
+        )
+        .await
     }
 
     /// Creates a new touch handler that holds touch pointer injectors.
@@ -133,8 +149,15 @@ impl TouchInjectorHandler {
         configuration_proxy: pointerinjector_config::SetupProxy,
         display_size: Size,
     ) -> Result<Rc<Self>, Error> {
+        let aggregator_proxy = connect_to_protocol::<interaction_observation::AggregatorMarker>()?;
         let injector_registry_proxy = connect_to_protocol::<pointerinjector::RegistryMarker>()?;
-        Self::new_handler(configuration_proxy, injector_registry_proxy, display_size).await
+        Self::new_handler(
+            aggregator_proxy,
+            configuration_proxy,
+            injector_registry_proxy,
+            display_size,
+        )
+        .await
     }
 
     /// Creates a new touch handler that holds touch pointer injectors.
@@ -144,6 +167,7 @@ impl TouchInjectorHandler {
     /// fasync::Task::local(handler.clone().watch_viewport()).detach();
     ///
     /// # Parameters
+    /// - `aggregator_proxy`: A proxy used to report to the activity service
     /// - `configuration_proxy`: A proxy used to get configuration details for pointer
     ///    injection.
     /// - `injector_registry_proxy`: A proxy used to register new pointer injectors.  If
@@ -153,6 +177,7 @@ impl TouchInjectorHandler {
     /// # Errors
     /// If unable to get injection view refs from `configuration_proxy`.
     async fn new_handler(
+        aggregator_proxy: interaction_observation::AggregatorProxy,
         configuration_proxy: pointerinjector_config::SetupProxy,
         injector_registry_proxy: pointerinjector::RegistryProxy,
         display_size: Size,
@@ -167,6 +192,7 @@ impl TouchInjectorHandler {
             display_size,
             injector_registry_proxy,
             configuration_proxy,
+            aggregator_proxy,
         });
 
         Ok(handler)
@@ -365,6 +391,11 @@ impl TouchInjectorHandler {
         }
     }
 
+    /// Reports the given event_time to the activity service.
+    async fn report_touch_activity(&self, event_time: zx::Time) -> Result<(), fidl::Error> {
+        self.aggregator_proxy.report_discrete_activity(event_time.into_nanos()).await
+    }
+
     /// Watches for viewport updates from the scene manager.
     pub async fn watch_viewport(self: Rc<Self>) {
         let configuration_proxy = self.configuration_proxy.clone();
@@ -511,6 +542,27 @@ mod tests {
         }
     }
 
+    /// Handles |fidl_fuchsia_interaction_observation::AggregatorRequest|s.
+    async fn handle_aggregator_request_stream(
+        mut stream: interaction_observation::AggregatorRequestStream,
+        expected_time: i64,
+    ) {
+        if let Some(request) = stream.next().await {
+            match request {
+                Ok(interaction_observation::AggregatorRequest::ReportDiscreteActivity {
+                    event_time,
+                    responder,
+                }) => {
+                    assert_eq!(event_time, expected_time);
+                    responder.send().expect("failed to respond");
+                }
+                other => panic!("expected aggregator report request, but got {:?}", other),
+            };
+        } else {
+            panic!("AggregatorRequestStream failed.");
+        }
+    }
+
     // Creates a |pointerinjector::Viewport|.
     fn create_viewport(min: f32, max: f32) -> pointerinjector::Viewport {
         pointerinjector::Viewport {
@@ -527,13 +579,17 @@ mod tests {
         let mut exec = fasync::TestExecutor::new().expect("executor needed");
 
         // Create touch handler.
+        let (aggregator_proxy, _) =
+            fidl::endpoints::create_proxy_and_stream::<interaction_observation::AggregatorMarker>()
+                .expect("Failed to create interaction observation Aggregator proxy and stream.");
         let (configuration_proxy, mut configuration_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector_config::SetupMarker>()
                 .expect("Failed to create pointerinjector Setup proxy and stream.");
         let (injector_registry_proxy, _injector_registry_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector::RegistryMarker>()
                 .expect("Failed to create pointerinjector Registry proxy and stream.");
         let touch_handler_fut = TouchInjectorHandler::new_handler(
+            aggregator_proxy,
             configuration_proxy,
             injector_registry_proxy,
             Size { width: DISPLAY_WIDTH, height: DISPLAY_HEIGHT },
@@ -632,6 +688,9 @@ mod tests {
         let mut exec = fasync::TestExecutor::new().expect("executor needed");
 
         // Set up fidl streams.
+        let (aggregator_proxy, _) =
+            fidl::endpoints::create_proxy_and_stream::<interaction_observation::AggregatorMarker>()
+                .expect("Failed to create interaction observation Aggregator proxy and stream.");
         let (configuration_proxy, mut configuration_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector_config::SetupMarker>()
                 .expect("Failed to create pointerinjector Setup proxy and stream.");
@@ -643,6 +702,7 @@ mod tests {
 
         // Create TouchInjectorHandler.
         let touch_handler_fut = TouchInjectorHandler::new_handler(
+            aggregator_proxy,
             configuration_proxy,
             injector_registry_proxy,
             Size { width: DISPLAY_WIDTH, height: DISPLAY_HEIGHT },
@@ -685,13 +745,17 @@ mod tests {
         let mut exec = fasync::TestExecutor::new().expect("executor needed");
 
         // Create touch handler.
+        let (aggregator_proxy, aggregator_request_stream) =
+            fidl::endpoints::create_proxy_and_stream::<interaction_observation::AggregatorMarker>()
+                .expect("Failed to create interaction observation Aggregator proxy and stream.");
         let (configuration_proxy, mut configuration_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector_config::SetupMarker>()
                 .expect("Failed to create pointerinjector Setup proxy and stream.");
         let (injector_registry_proxy, _injector_registry_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector::RegistryMarker>()
                 .expect("Failed to create pointerinjector Registry proxy and stream.");
         let touch_handler_fut = TouchInjectorHandler::new_handler(
+            aggregator_proxy,
             configuration_proxy,
             injector_registry_proxy,
             Size { width: DISPLAY_WIDTH, height: DISPLAY_HEIGHT },
@@ -769,8 +833,12 @@ mod tests {
         // matches `expected_event`.
         let device_fut =
             handle_device_request_stream(injector_device_request_stream, expected_event);
-        let (handle_result, _) =
-            exec.run_singlethreaded(futures::future::join(handle_event_fut, device_fut));
+        let aggregator_fut =
+            handle_aggregator_request_stream(aggregator_request_stream, event_time.into_nanos());
+        let (handle_result, _) = exec.run_singlethreaded(futures::future::join(
+            handle_event_fut,
+            futures::future::join(device_fut, aggregator_fut),
+        ));
 
         // No unhandled events.
         assert_matches!(
@@ -785,13 +853,17 @@ mod tests {
         let mut exec = fasync::TestExecutor::new().expect("executor needed");
 
         // Create touch handler.
+        let (aggregator_proxy, _) =
+            fidl::endpoints::create_proxy_and_stream::<interaction_observation::AggregatorMarker>()
+                .expect("Failed to create interaction observation Aggregator proxy and stream.");
         let (configuration_proxy, mut configuration_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector_config::SetupMarker>()
                 .expect("Failed to create pointerinjector Setup proxy and stream.");
         let (injector_registry_proxy, mut injector_registry_request_stream) =
             fidl::endpoints::create_proxy_and_stream::<pointerinjector::RegistryMarker>()
                 .expect("Failed to create pointerinjector Registry proxy and stream.");
         let touch_handler_fut = TouchInjectorHandler::new_handler(
+            aggregator_proxy,
             configuration_proxy,
             injector_registry_proxy,
             Size { width: DISPLAY_WIDTH, height: DISPLAY_HEIGHT },