From 8389c9de6f80908f057f6b09cac06f6bcc4d741a Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Wed, 22 Jan 2020 07:10:39 -0800
Subject: Fix to the boot loop on AAE platforms.

Bug: 148084328
Test: AAE boot and test userswitching manually.
Change-Id: I055f66542f5655fadd3dba08b263555b1f5a929e
---
 services/core/java/com/android/server/wm/RootWindowContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index d3da50060104..0b54245cd424 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -2004,7 +2004,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
                 final ActivityStack stack = display.getStackAt(stackNdx);
                 stack.switchUser(userId);
                 Task task = stack.getTopMostTask();
-                if (task != null) {
+                if (task != null && task != stack) {
                     stack.positionChildAtTop(task);
                 }
             }
-- 
cgit v1.2.3-59-g8ed1b