Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ieaa8e21759437144f7af8d7c6fa227062214ec6f
This commit is contained in:
TreeHugger Robot
2020-04-10 05:31:22 +00:00
committed by Automerger Merge Worker
parent 0be1de4f61 f2cfb002b6
commit f0893dd775
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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) {