commit d07fa6e0dc8141e5e77ffec6863f81a246bf8384
author Svetoslav Ganov <svetoslavganov@google.com> Thu Oct 11 11:37:33 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 11 11:37:33 2012 -0700
tree 0b5be0e9646a9574f132687b31ed420b4fb6c6bf
parent 26e3f3df8761ee3c75155ca848d29cfe820a2a8c
parent ee44fae19664594d4a17dd86723106533f4b218a

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

services/java/com/android/server/accessibility/ScreenMagnifier.java

diff --git a/services/java/com/android/server/accessibility/ScreenMagnifier.java b/services/java/com/android/server/accessibility/ScreenMagnifier.java
index 51ccd47..4dee597 100644
--- a/services/java/com/android/server/accessibility/ScreenMagnifier.java
+++ b/services/java/com/android/server/accessibility/ScreenMagnifier.java
@@ -376,7 +376,8 @@
             }
             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);
                 }