commit 14a3fb98e5ec5f366e810ad4d1f2a73ef8407ac6
author Wale Ogunwale <ogunwale@google.com> Sun Sep 11 15:19:05 2016 -0700
committer Wale Ogunwale <ogunwale@google.com> Mon Sep 19 19:29:00 2016 +0000
tree fd2f25c9b2b744e3e65497797b1cd88c9dfb4840
parent 3d288b3e2ca7fad081014ada733bac4ed488c2f1

Switched TaskStack to use WindowContainer

Bug: 30060889
Test: Manual testing and existing tests still pass.
Change-Id: Id29c4aaf6580623a748bd69316fc6a4663ff1d37

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 979eb9d..9035387 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -772,8 +772,7 @@
                 final TaskStack appStack = wtoken.mTask.mStack;
 
                 // TODO: Use WindowContainer.compareTo() once everything is using WindowContainer
-                if ((focusedAppStack == appStack
-                        && appStack.isFirstGreaterThanSecond(focusedApp, wtoken))
+                if ((focusedAppStack == appStack && focusedApp.compareTo(wtoken) > 0)
                         || mStacks.indexOf(focusedAppStack) > mStacks.indexOf(appStack)) {
                     // App stack below focused app stack. No focus for you!!!
                     if (DEBUG_FOCUS_LIGHT) Slog.v(TAG_WM,