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

am 013d14f8: Merge "Make lock task check if focused better" into lmp-mr1-dev

Browse Source 
* commit '013d14f887a8b317d60bd65fa3d3bbb215095cb4':
  Make lock task check if focused better
This commit is contained in:
Jason Monk
2014-10-24 15:16:23 +00:00
committed by Android Git Automerger
parent 962c5ab849 013d14f887
commit 730409c332
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/am/ActivityManagerService.java
View File

@@ -8852,7 +8852,8 @@ public final class ActivityManagerService extends ActivityManagerNative
task = mStackSupervisor.anyTaskForIdLocked(task.taskId);
if (task != null) {
if (!isSystemInitiated
&& ((mFocusedActivity == null) || (task != mFocusedActivity.task))) {
&& ((mStackSupervisor.getFocusedStack() == null)
|| (task != mStackSupervisor.getFocusedStack().topTask()))) {
throw new IllegalArgumentException("Invalid task, not in foreground");
}
mStackSupervisor.setLockTaskModeLocked(task, !isSystemInitiated);