From ce48a2522586282459893b1e5513c57e6a5136a0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 21 Mar 2019 11:03:03 -0700
Subject: [PATCH] Skip the target activity when settings state to disallow
 sysui flags

Bug: 128634828
Test: Swipe up with 2 button, ensure that the flags change
Change-Id: I70bdb03f002eb14f9ad00fc52559806b215e481c
---
 .../com/android/server/wm/RecentsAnimationController.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index 26df832bf3168..381366995dd51 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -208,7 +208,10 @@ public class RecentsAnimationController implements DeathRecipient {
             try {
                 synchronized (mService.getWindowManagerLock()) {
                     for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
-                        mPendingAnimations.get(i).mTask.setCanAffectSystemUiFlags(behindSystemBars);
+                        final Task task = mPendingAnimations.get(i).mTask;
+                        if (task.getActivityType() != mTargetActivityType) {
+                            task.setCanAffectSystemUiFlags(behindSystemBars);
+                        }
                     }
                     mService.mWindowPlacerLocked.requestTraversal();
                 }