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

This commit is contained in:
George Mount
2016-05-26 22:15:31 +00:00
committed by Android (Google) Code Review

View File

@@ -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 {