diff options
| author | Dave Burke <daveburke@google.com> | 2013-10-10 19:41:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 19:41:28 -0700 |
| commit | 218566c303c7b71d6991dce2dfdd8d718659c368 (patch) | |
| tree | 5e0a93bbeab0bebdbe28e348153f7b0dca184dc5 /libs/input | |
| parent | 4a1e00fb3abb4e0598c3fb9a35c04349f672c5f9 (diff) | |
| parent | 06c964d9b31ac81d3521f97427cdab77ee7d1cff (diff) | |
| download | frameworks_native-218566c303c7b71d6991dce2dfdd8d718659c368.zip frameworks_native-218566c303c7b71d6991dce2dfdd8d718659c368.tar.gz frameworks_native-218566c303c7b71d6991dce2dfdd8d718659c368.tar.bz2 | |
am 06c964d9: am 9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev
* commit '06c964d9b31ac81d3521f97427cdab77ee7d1cff':
Eliminate latency when resampling is disabled
Diffstat (limited to 'libs/input')
| -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 d6507f4..9bd7fc6 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); |