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

Merge "Don't consider tasks with INITIALIZING top activity as visible" into qt-dev am: 0a252361dd

Browse Source 
am: 48c2a0f493

Change-Id: I70d5e7f2073b245c4dd2f8e7cb08a192c8e6536e
This commit is contained in:
Bernardo Rufino
2019-09-30 04:29:25 -07:00
committed by android-build-merger
parent 225c0d2a26 48c2a0f493
commit 4638ea10e2
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -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.am.ActivityManagerService.MY_PID;
import static com.android.server.wm.ActivityStack.ActivityState.DESTROYED; 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.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.PAUSED;
import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; import static com.android.server.wm.ActivityStack.ActivityState.PAUSING;
import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; import static com.android.server.wm.ActivityStack.ActivityState.RESUMED;
@@ -553,14 +552,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
continue; continue;
} }
ActivityRecord topActivity = task.getTopActivity(); ActivityRecord topActivity = task.getTopActivity();
if (topActivity == null) { if (topActivity != null && topActivity.visible) {
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)) {
return true; return true;
} }
} }