diff options
| author | Dave Burke <daveburke@google.com> | 2013-10-11 02:33:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 02:33:15 +0000 |
| commit | 9c0dfa09731a8366a7cdcd7171dde64b73af0d5c (patch) | |
| tree | c67289847ad4d341b09d06da92857ee91a1b762f | |
| parent | 5d6aa95129a13aae37a60b3e4246a0592dab396d (diff) | |
| parent | ad526f8505efe2ccd800e4665864b10bdae31e29 (diff) | |
| download | native-9c0dfa09731a8366a7cdcd7171dde64b73af0d5c.tar.gz | |
Merge "Eliminate latency when resampling is disabled" into klp-dev
| -rw-r--r-- | libs/input/InputTransport.cpp | 10 |
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); |