Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev am: 0a252361dd am: 48c2a0f493
am: ae9fdac2e7
Change-Id: I98abc89da98fd41ff1d1bcbff0b42e6bf0583849
This commit is contained in:
@@ -23,7 +23,6 @@ import static android.view.Display.INVALID_DISPLAY;
|
||||
import static com.android.server.am.ActivityManagerService.MY_PID;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.DESTROYING;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.INITIALIZING;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.PAUSED;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.PAUSING;
|
||||
import static com.android.server.wm.ActivityStack.ActivityState.RESUMED;
|
||||
@@ -553,14 +552,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
|
||||
continue;
|
||||
}
|
||||
ActivityRecord topActivity = task.getTopActivity();
|
||||
if (topActivity == null) {
|
||||
continue;
|
||||
}
|
||||
// If an activity has just been started it will not yet be visible, but
|
||||
// is expected to be soon. We treat this as if it were already visible.
|
||||
// This ensures a subsequent activity can be started even before this one
|
||||
// becomes visible.
|
||||
if (topActivity.visible || topActivity.isState(INITIALIZING)) {
|
||||
if (topActivity != null && topActivity.visible) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user