summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Vadim Caen <caen@google.com> 2022-02-21 21:52:41 +0100
committer Vadim Caen <caen@google.com> 2022-03-24 14:14:26 +0100
commit6a074eca5cca62cfd49bb65af6b2152e051c9ef6 (patch)
treee0ccc0d980719b727d78413d4c917c6d3062e9fe /libs
parentc20089e4beab2ba7700ff29a66d0f569ce0593eb (diff)
Improve startBackNavigation stability
- Use the focused window instead of the topApp window - Instead we now rely on WindowManagerService to get the focused window. - SystemUI does not have ActivityRecord so we can't rely on the top window of the Task to find the correct window on which the callback will be called. - Introduce a Builder for BackNavigationInfo - This reduces the number of variable needed outside the synchonized block. - It also reduces the number of early return of BackNavigationInfo instances - Adding log messages to help further debug the method. Test: BackNavigationControllerTests Test: Manual dismiss of SystemUi dialog in QS Bug: 216604581 Fixes: 221458292 Change-Id: I9ba2c7f89956f34d6338824502c210b3e58dc076 Introduce builder for BackNavigationInfo Change-Id: I14b4a4b3abc8f417998b7b32831cb3d5c4faa491
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
index 3e7ee25da5f8..05230a9417bb 100644
--- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
+++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java
@@ -44,6 +44,7 @@ import com.android.wm.shell.TestShellExecutor;
import com.android.wm.shell.common.ShellExecutor;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -109,6 +110,7 @@ public class BackAnimationControllerTest {
}
@Test
+ @Ignore("b/207481538")
public void crossActivity_screenshotAttachedAndVisible() {
SurfaceControl screenshotSurface = new SurfaceControl();
HardwareBuffer hardwareBuffer = mock(HardwareBuffer.class);