am 06c964d9: am 9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev

* commit '06c964d9b31ac81d3521f97427cdab77ee7d1cff':
  Eliminate latency when resampling is disabled
This commit is contained in:
Dave Burke 2013-10-10 19:41:28 -07:00 committed by Android Git Automerger
commit 218566c303

View File

@ -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);