From 2c18333577059663b1d89a86752f382b052ca3f8 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 7 Aug 2014 13:43:05 -0700
Subject: [PATCH] Remove clipToOutline workaround for null backgrounds

BUG: 16566746
Change-Id: Icdf0d40b75c0fa9d972eb6300f51079e48fbe5fd
---
 .../src/com/android/internal/policy/impl/PhoneWindow.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index ff3cd9d651b12..964acbdc34335 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1314,7 +1314,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             mBackgroundDrawable = drawable;
             if (mDecor != null) {
                 mDecor.setWindowBackground(drawable);
-                mDecor.setClipToOutline(drawable != null && mClipToOutline);
             }
         }
     }
@@ -3389,10 +3388,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             }
             mDecor.setWindowBackground(background);
 
-            if (background != null) {
-                mDecor.setClipToOutline(mClipToOutline);
-            }
-
             final Drawable frame;
             if (mFrameResource != 0) {
                 frame = getContext().getDrawable(mFrameResource);
@@ -3402,6 +3397,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
             mDecor.setWindowFrame(frame);
 
             mDecor.setElevation(mElevation);
+            mDecor.setClipToOutline(mClipToOutline);
 
             if (mTitle != null) {
                 setTitle(mTitle);