Merge "Determine if the activity is the topmost one" into rvc-dev am: b4d5aef6b0

Change-Id: Ia211070b68bd04b256384618db989abcaadefd02
2020-04-10 04:40:08 +00:00
parent 949ce3129c b4d5aef6b0
commit fb4bb30908
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -7368,7 +7368,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
        }
        final ActivityStack stack = getRootTask();
        return stack != null &&
-                stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */);
+                stack.checkKeyguardVisibility(this, true /* shouldBeVisible */,
+                        stack.topRunningActivity() == this /* isTop */);
    }

    void setTurnScreenOn(boolean turnScreenOn) {