am d26a8b7: am cda8329: Merge "Distance max set incorrectly"

* commit 'd26a8b73c918f04fc1d78c03b721eca3757e446a':
  Distance max set incorrectly

Author: Dianne Hackborn

services/input/InputReader.cpp

@@ -2874,7 +2874,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
             mOrientedRanges.distance.min =
                     mRawPointerAxes.distance.minValue * mDistanceScale;
             mOrientedRanges.distance.max =
-                    mRawPointerAxes.distance.minValue * mDistanceScale;
+                    mRawPointerAxes.distance.maxValue * mDistanceScale;
             mOrientedRanges.distance.flat = 0;
             mOrientedRanges.distance.fuzz =
                     mRawPointerAxes.distance.fuzz * mDistanceScale;