summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2013-08-15 19:26:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-15 19:26:43 +0000
commitcf770f41ad9fdeadb5d5000071a6f7ee8818f212 (patch)
tree9b4c719189dc37d70f9b1584afdfa6f020c10bf9 /services
parente0475c828773aae42bf6bf54422df996d6b0fcef (diff)
parenteeadb32488852d8fa6b44c8ce2b6c0a1c8a5346a (diff)
downloadframeworks_base-cf770f41ad9fdeadb5d5000071a6f7ee8818f212.zip
frameworks_base-cf770f41ad9fdeadb5d5000071a6f7ee8818f212.tar.gz
frameworks_base-cf770f41ad9fdeadb5d5000071a6f7ee8818f212.tar.bz2
Merge "Bound touch and tool axes lengths below at 0" into klp-dev
Diffstat (limited to 'services')
-rw-r--r--services/input/InputReader.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/input/InputReader.h b/services/input/InputReader.h
index 98daaf5..a8bb636 100644
--- a/services/input/InputReader.h
+++ b/services/input/InputReader.h
@@ -1285,6 +1285,9 @@ protected:
if (haveSizeBias) {
*outSize += sizeBias;
}
+ if (*outSize < 0) {
+ *outSize = 0;
+ }
}
} mCalibration;