Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: 8453136b8e" into nyc-mr1-dev-plus-aosp

2016-05-27 03:30:47 +00:00
parent 231b1d7815 a1ad1996a8
commit c3137c85ee
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5948,7 +5948,7 @@ public class Activity extends ContextThemeWrapper
     * @return true if this is the topmost, non-finishing activity in its task.
     */
    private boolean isTopOfTask() {
-        if (mToken == null || mWindow == null || !mWindowAdded) {
+        if (mToken == null || mWindow == null) {
            return false;
        }
        try {