Throw IAE on invalid scale

 Bug: 16565964

Change-Id: I0cc35c532b42433381e1ae7f350c95ecbb4d09c3

diff --git a/core/java/android/view/RenderNode.java b/core/java/android/view/RenderNode.java
index 8aba8af..2d54acb 100644 (file)
--- a/core/java/android/view/RenderNode.java
+++ b/core/java/android/view/RenderNode.java
@@ -597,6 +597,9 @@ public class RenderNode {
      * @see #getScaleX()
      */
     public boolean setScaleX(float scaleX) {
+        if (scaleX > 1000000) {
+            throw new IllegalArgumentException("Invalid scale: " + scaleX);
+        }
         return nSetScaleX(mNativeRenderNode, scaleX);
     }
 
@@ -618,6 +621,9 @@ public class RenderNode {
      * @see #getScaleY()
      */
     public boolean setScaleY(float scaleY) {
+        if (scaleY > 1000000) {
+            throw new IllegalArgumentException("Invalid scale: " + scaleY);
+        }
         return nSetScaleY(mNativeRenderNode, scaleY);
     }