summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2013-10-10 18:54:12 -0700
committerThe Android Automerger <android-build@google.com>2013-10-10 22:13:38 -0700
commita8b5982c32f6232428e9dcab691bb0bca6f72d63 (patch)
tree38467e217a5fbdf9971a9e53bac2ce3f0dd6189c
parent0e9c51ec78df650e2a340978ccce920d419a9fa1 (diff)
downloadnative-a8b5982c32f6232428e9dcab691bb0bca6f72d63.tar.gz
Eliminate latency when resampling is disabled
Since the latency was introduced to avoid egregious errors during resampling, remove it when we aren't resampling. Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
-rw-r--r--libs/input/InputTransport.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/input/InputTransport.cpp b/libs/input/InputTransport.cpp
index d6507f4601..9bd7fc6eb3 100644
--- a/libs/input/InputTransport.cpp
+++ b/libs/input/InputTransport.cpp
@@ -376,13 +376,13 @@ InputConsumer::~InputConsumer() {
bool InputConsumer::isTouchResamplingEnabled() {
char value[PROPERTY_VALUE_MAX];
- int length = property_get("debug.inputconsumer.resample", value, NULL);
+ int length = property_get("ro.input.noresample", value, NULL);
if (length > 0) {
- if (!strcmp("0", value)) {
+ if (!strcmp("1", value)) {
return false;
}
- if (strcmp("1", value)) {
- ALOGD("Unrecognized property value for 'debug.inputconsumer.resample'. "
+ if (strcmp("0", value)) {
+ ALOGD("Unrecognized property value for 'ro.input.noresample'. "
"Use '1' or '0'.");
}
}
@@ -511,7 +511,7 @@ status_t InputConsumer::consumeBatch(InputEventFactoryInterface* factory,
status_t result;
for (size_t i = mBatches.size(); i-- > 0; ) {
Batch& batch = mBatches.editItemAt(i);
- if (frameTime < 0) {
+ if (frameTime < 0 || !mResampleTouch) {
result = consumeSamples(factory, batch, batch.samples.size(),
outSeq, outEvent);
mBatches.removeAt(i);