Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ee9311 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Only copy layout param title if it is different from the current one."... 

Merge "Only copy layout param title if it is different from the current one." into nyc-dev am: 70c0817b
am: 7c8b1a87

* commit '7c8b1a87':
  Only copy layout param title if it is different from the current one.
parents dbe23f0b 7c8b1a87

core/java/android/view/WindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.text.TextUtils; 
import android.util.Log;



import java.util.List;



import java.util.Objects;



/**

 * The interface that apps use to talk to the window manager.
@@ -1950,7 +1950,7 @@ public interface WindowManager extends ViewManager { 
                // already have one.

                packageName = o.packageName;

            }

            if (o.mTitle != null) {

            if (!Objects.equals(mTitle, o.mTitle) && o.mTitle != null) {

                // NOTE: mTitle only copied if the originator set one.

                mTitle = o.mTitle;

                changes |= TITLE_CHANGED;