diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 75e6faf97294..6e9219a75324 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -5262,7 +5262,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A boolean canAffectSystemUiFlags() { return task != null && task.canAffectSystemUiFlags() && isVisible() - && !inPinnedWindowingMode(); + && !mWaitForEnteringPinnedMode && !inPinnedWindowingMode(); } @Override diff --git a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java index 5a434988e548..0608cf4abfde 100644 --- a/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java @@ -362,6 +362,8 @@ public class RootWindowContainerTests extends WindowTestsBase { // Ensure a task has moved over. ensureTaskPlacement(task, activity); assertTrue(task.inPinnedWindowingMode()); + assertFalse("Entering PiP activity must not affect SysUiFlags", + activity.canAffectSystemUiFlags()); // The activity with fixed orientation should not apply letterbox when entering PiP. final int requestedOrientation = task.getConfiguration().orientation |