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

Browse Source 
Change-Id: Ib8f3fb007573e4068f3eb0d3b7e2fd470401df6e
This commit is contained in:
TreeHugger Robot
2020-04-10 05:07:56 +00:00
committed by Automerger Merge Worker
parent 52f5003775 c7343394ae
commit f2cfb002b6
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(); final ActivityStack stack = getRootTask();
return stack != null && return stack != null &&
stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */); stack.checkKeyguardVisibility(this, true /* shouldBeVisible */,
stack.topRunningActivity() == this /* isTop */);
} }
void setTurnScreenOn(boolean turnScreenOn) { void setTurnScreenOn(boolean turnScreenOn) {