Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Activity Transition mess-up." into nyc-dev

Browse Source
This commit is contained in:
George Mount
2016-05-26 22:15:31 +00:00
committed by Android (Google) Code Review
parent 793ac34219 f43ea5d4d2
commit bd34103c5d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@@ -5948,7 +5948,7 @@ public class Activity extends ContextThemeWrapper
* @return true if this is the topmost, non-finishing activity in its task. * @return true if this is the topmost, non-finishing activity in its task.
*/ */
private boolean isTopOfTask() { private boolean isTopOfTask() {
if (mToken == null || mWindow == null || !mWindowAdded) { if (mToken == null || mWindow == null) {
return false; return false;
} }
try { try {