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

Author: sganov

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

@@ -376,7 +376,8 @@ public void onMotionEvent(MotionEvent event) {
             }
             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);
                 }