diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
| commit | 1cdd1b5ad204cb319174f86b522fcb0dc7968ed6 (patch) | |
| tree | 208c78f58721f44168992cf88ae8d2b821f090de /services/inputflinger | |
| parent | 5e78568dab3b1bbddd1cbc0dd2004d9c2ddbdfeb (diff) | |
| parent | 3492a21877f93b2240dc823392b7e8adb2e1809e (diff) | |
| download | frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.zip frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.gz frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
include/android/input.h
Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
Diffstat (limited to 'services/inputflinger')
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index da442b2..3813d9b 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -4724,7 +4724,7 @@ void TouchInputMapper::cookPointerData() { bottom = float(mRawPointerAxes.x.maxValue - rawLeft) * mXScale + mXTranslate; top = float(mRawPointerAxes.x.maxValue - rawRight) * mXScale + mXTranslate; orientation -= M_PI_2; - if (orientation < mOrientedRanges.orientation.min) { + if (mOrientedRanges.haveOrientation && orientation < mOrientedRanges.orientation.min) { orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min); } break; @@ -4736,7 +4736,7 @@ void TouchInputMapper::cookPointerData() { bottom = float(mRawPointerAxes.y.maxValue - rawTop) * mYScale + mYTranslate; top = float(mRawPointerAxes.y.maxValue - rawBottom) * mYScale + mYTranslate; orientation -= M_PI; - if (orientation < mOrientedRanges.orientation.min) { + if (mOrientedRanges.haveOrientation && orientation < mOrientedRanges.orientation.min) { orientation += (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min); } break; @@ -4748,7 +4748,7 @@ void TouchInputMapper::cookPointerData() { bottom = float(rawRight - mRawPointerAxes.x.minValue) * mXScale + mXTranslate; top = float(rawLeft - mRawPointerAxes.x.minValue) * mXScale + mXTranslate; orientation += M_PI_2; - if (orientation > mOrientedRanges.orientation.max) { + if (mOrientedRanges.haveOrientation && orientation > mOrientedRanges.orientation.max) { orientation -= (mOrientedRanges.orientation.max - mOrientedRanges.orientation.min); } break; |