diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index ba3fc1e55c54c..8aa27853b4622 100644
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@@ -282,11 +282,10 @@ public class AppWidgetHostView extends FrameLayout {
     }
 
     private SizeF computeSizeFromLayout(int left, int top, int right, int bottom) {
-        Rect padding = getDefaultPadding();
         float density = getResources().getDisplayMetrics().density;
         return new SizeF(
-                (right - left - padding.right - padding.left) / density,
-                (bottom - top - padding.bottom - padding.top) / density
+                (right - left - getPaddingLeft() - getPaddingRight()) / density,
+                (bottom - top - getPaddingTop() - getPaddingBottom()) / density
         );
     }
 
@@ -386,7 +385,7 @@ public class AppWidgetHostView extends FrameLayout {
             maxHeight = Math.max(maxHeight, paddedSize.getHeight());
         }
         if (paddedSizes.equals(
-                widgetManager.getAppWidgetOptions(mAppWidgetId).<PointF>getParcelableArrayList(
+                widgetManager.getAppWidgetOptions(mAppWidgetId).<SizeF>getParcelableArrayList(
                         AppWidgetManager.OPTION_APPWIDGET_SIZES))) {
             return;
         }