am 72201963: Fix issue #1806217.

Merge commit '72201963350da86a5c200196364e18cbee70b3a5'

* commit '72201963350da86a5c200196364e18cbee70b3a5':
  Fix issue #1806217.
This commit is contained in:
Dianne Hackborn
2009-06-23 13:08:38 -07:00
committed by The Android Open Source Project

View File

@@ -952,7 +952,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
@Override
public final void setBackgroundDrawable(Drawable drawable) {
if (drawable != mBackgroundDrawable) {
if (drawable != mBackgroundDrawable || mBackgroundResource != 0) {
mBackgroundResource = 0;
mBackgroundDrawable = drawable;
if (mDecor != null) {