Merge "Query outline on background size change"
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 0ee9e06..706fb1c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14994,6 +14994,7 @@
         if (mBackgroundSizeChanged) {
             background.setBounds(0, 0,  mRight - mLeft, mBottom - mTop);
             mBackgroundSizeChanged = false;
+            invalidateOutline();
         }
 
         // Attempt to use a display list if requested.
diff --git a/libs/hwui/Outline.h b/libs/hwui/Outline.h
index 5e7f899..024bdfd 100644
--- a/libs/hwui/Outline.h
+++ b/libs/hwui/Outline.h
@@ -30,7 +30,7 @@
             , mType(kOutlineType_None)
             , mRadius(0) {}
 
-    void setRoundRect(int left, int top, int right, int bottom, int radius) {
+    void setRoundRect(int left, int top, int right, int bottom, float radius) {
         mType = kOutlineType_RoundRect;
         mBounds.set(left, top, right, bottom);
         mRadius = radius;