Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev

2012-10-11 11:37:33 -07:00
parent 26e3f3df87 ee44fae196
commit d07fa6e0dc
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -376,7 +376,8 @@ public final class ScreenMagnifier implements EventStreamTransformation {
            }
            if (event.getActionMasked() == MotionEvent.ACTION_UP) {
                clear();
-                final float scale = mMagnificationController.getScale();
+                final float scale = Math.min(Math.max(mMagnificationController.getScale(),
+                        MIN_SCALE), MAX_SCALE);
                if (scale != getPersistedScale()) {
                    persistScale(scale);
                }