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,