Revert "Add flag to enable jerk prediction pruning."
This reverts commit fe8bbb039dbe458b485c055bbfc6b862681809f3.
Reason for revert: Performance regression: b/330854747
BUG: 330854747
Change-Id: I323b13594fd271af5f73579218fe4797ea0d6b92
diff --git a/libs/input/MotionPredictor.cpp b/libs/input/MotionPredictor.cpp
index e836a4c..c4e3ff6 100644
--- a/libs/input/MotionPredictor.cpp
+++ b/libs/input/MotionPredictor.cpp
@@ -22,21 +22,17 @@
#include <cmath>
#include <cstddef>
#include <cstdint>
-#include <limits>
#include <string>
#include <vector>
#include <android-base/logging.h>
#include <android-base/strings.h>
#include <android/input.h>
-#include <com_android_input_flags.h>
#include <attestation/HmacKeyManager.h>
#include <ftl/enum.h>
#include <input/TfLiteMotionPredictor.h>
-namespace input_flags = com::android::input::flags;
-
namespace android {
namespace {
@@ -201,14 +197,7 @@
// device starts to speed up, but avoids producing noisy predictions as it slows down.
break;
}
- if (input_flags::enable_jerk_prediction_pruning()) {
- // TODO(b/266747654): Stop predictions if confidence is < some threshold
- // Arbitrarily high pruning index, will correct once jerk thresholding is implemented.
- const size_t upperBoundPredictionIndex = std::numeric_limits<size_t>::max();
- if (i > upperBoundPredictionIndex) {
- break;
- }
- }
+ // TODO(b/266747654): Stop predictions if confidence is < some threshold.
const TfLiteMotionPredictorSample::Point predictedPoint =
convertPrediction(axisFrom, axisTo, predictedR[i], predictedPhi[i]);
diff --git a/libs/input/input_flags.aconfig b/libs/input/input_flags.aconfig
index c1f5e2a..b48b0fb 100644
--- a/libs/input/input_flags.aconfig
+++ b/libs/input/input_flags.aconfig
@@ -128,10 +128,3 @@
description: "Enable fling scrolling to be stopped by putting a finger on the touchpad again"
bug: "281106755"
}
-
-flag {
- name: "enable_jerk_prediction_pruning"
- namespace: "input"
- description: "Enable prediction pruning based on jerk thresholds."
- bug: "266747654"
-}