diff options
| -rw-r--r-- | core/java/android/view/WindowManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 0c5a5fc4bd45..18dfdfd6de03 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1724,7 +1724,7 @@ public interface WindowManager extends ViewManager { } public final CharSequence getTitle() { - return mTitle; + return mTitle != null ? mTitle : ""; } /** @hide */ @@ -1950,7 +1950,8 @@ public interface WindowManager extends ViewManager { // already have one. packageName = o.packageName; } - if (!mTitle.equals(o.mTitle)) { + if (o.mTitle != null) { + // NOTE: mTitle only copied if the originator set one. mTitle = o.mTitle; changes |= TITLE_CHANGED; } @@ -2194,7 +2195,7 @@ public interface WindowManager extends ViewManager { } } - private CharSequence mTitle = ""; + private CharSequence mTitle = null; /** @hide */ @Override |