diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 55c6cb89c936e..3d5d3faa8c16e 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -1087,6 +1087,10 @@ public abstract class Window {
 
     /**
      * Sets the window elevation.
+     * <p>
+     * Changes to this property take effect immediately and will cause the
+     * window surface to be recreated. This is an expensive operation and as a
+     * result, this property should not be animated.
      *
      * @param elevation The window elevation.
      * @see View#setElevation(float)
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 30a271e0aa96c..1f9867008ba38 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1338,6 +1338,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         if (mDecor != null) {
             mDecor.setElevation(elevation);
         }
+        dispatchWindowAttributesChanged(getAttributes());
     }
 
     @Override