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

Merge "Do not wait for invisible activity when turning on screen" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-19 07:56:52 +00:00
committed by Android (Google) Code Review
parent 611e9ca2fa 2430cb4edb
commit 0c8d32f858
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2171,6 +2171,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
return;
}
if (mActivityRecord != null) {
if (!mActivityRecord.mVisibleRequested) return;
if (mActivityRecord.allDrawn) {
// The allDrawn of activity is reset when the visibility is changed to visible, so
// the content should be ready if allDrawn is set.

8
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -673,6 +673,14 @@ public class WindowStateTests extends WindowTestsBase {
// Keyguard host window should be always contained. The drawn app or app with starting
// window are unnecessary to draw.
assertEquals(Arrays.asList(keyguardHostWindow, startingWindow), outWaitingForDrawn);
// No need to wait for a window of invisible activity even if the window has surface.
final WindowState invisibleApp = mAppWindow;
invisibleApp.mActivityRecord.mVisibleRequested = false;
invisibleApp.mActivityRecord.allDrawn = false;
outWaitingForDrawn.clear();
invisibleApp.requestDrawIfNeeded(outWaitingForDrawn);
assertTrue(outWaitingForDrawn.isEmpty());
}
@UseTestDisplay(addWindows = W_ABOVE_ACTIVITY)