diff options
| author | 2016-05-26 22:15:31 +0000 | |
|---|---|---|
| committer | 2016-05-26 22:15:32 +0000 | |
| commit | bd34103c5defbfd180be6a387eb5aa82d4b97eac (patch) | |
| tree | ac67445b22b6e7d8019e1c9dc1db3741bda1b4aa | |
| parent | 793ac342196c57f6b89ad9d1425fc420fbb44bb5 (diff) | |
| parent | f43ea5d4d2286a9b00435893f7528255a898d4d7 (diff) | |
Merge "Fix Activity Transition mess-up." into nyc-dev
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 6d405f6bbd0e..ac5f3effa1f9 100644 --- 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 { |