commit aefd4a49d88b3aaf5637e9e2d84feb64115bdb1d
author Saho Kobayashi <sahok@google.com> Thu Mar 21 04:54:39 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 04:54:39 2024 +0000
tree 51d209b7925a3d4306a36144a50e46826042773c
parent f49bc7438d79a10e5a1800b1e147ecffb22935e1

Revert "Stylus Metrics: Switch to non-bootstrap statslog library"

This reverts commit f49bc7438d79a10e5a1800b1e147ecffb22935e1.

Reason for revert: ARC boot is failing after this CL http://b/330281690

Change-Id: Ib508544df1d4ab4b7587c3f04804cec2d2310d77

libs/input/MotionPredictorMetricsManager.cpp

diff --git a/libs/input/MotionPredictorMetricsManager.cpp b/libs/input/MotionPredictorMetricsManager.cpp
index 149a36e..6872af2 100644
--- a/libs/input/MotionPredictorMetricsManager.cpp
+++ b/libs/input/MotionPredictorMetricsManager.cpp
@@ -21,11 +21,14 @@
 #include <algorithm>
 
 #include <android-base/logging.h>
-#include <statslog.h>
 
 #include "Eigen/Core"
 #include "Eigen/Geometry"
 
+#ifdef __ANDROID__
+#include <statslog_libinput.h>
+#endif
+
 namespace android {
 namespace {
 
@@ -45,18 +48,22 @@
 
 void MotionPredictorMetricsManager::defaultReportAtomFunction(
         const MotionPredictorMetricsManager::AtomFields& atomFields) {
-    android::util::stats_write(android::util::STYLUS_PREDICTION_METRICS_REPORTED,
-                               /*stylus_vendor_id=*/0,
-                               /*stylus_product_id=*/0,
-                               atomFields.deltaTimeBucketMilliseconds,
-                               atomFields.alongTrajectoryErrorMeanMillipixels,
-                               atomFields.alongTrajectoryErrorStdMillipixels,
-                               atomFields.offTrajectoryRmseMillipixels,
-                               atomFields.pressureRmseMilliunits,
-                               atomFields.highVelocityAlongTrajectoryRmse,
-                               atomFields.highVelocityOffTrajectoryRmse,
-                               atomFields.scaleInvariantAlongTrajectoryRmse,
-                               atomFields.scaleInvariantOffTrajectoryRmse);
+    // Call stats_write logging function only on Android targets (not supported on host).
+#ifdef __ANDROID__
+    android::stats::libinput::
+            stats_write(android::stats::libinput::STYLUS_PREDICTION_METRICS_REPORTED,
+                            /*stylus_vendor_id=*/0,
+                            /*stylus_product_id=*/0,
+                            atomFields.deltaTimeBucketMilliseconds,
+                            atomFields.alongTrajectoryErrorMeanMillipixels,
+                            atomFields.alongTrajectoryErrorStdMillipixels,
+                            atomFields.offTrajectoryRmseMillipixels,
+                            atomFields.pressureRmseMilliunits,
+                            atomFields.highVelocityAlongTrajectoryRmse,
+                            atomFields.highVelocityOffTrajectoryRmse,
+                            atomFields.scaleInvariantAlongTrajectoryRmse,
+                            atomFields.scaleInvariantOffTrajectoryRmse);
+#endif
 }
 
 MotionPredictorMetricsManager::MotionPredictorMetricsManager(