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

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

Browse Source 
* commit '730409c332e19c34f7c309fbe054532eec88bdbc':
  Make lock task check if focused better
This commit is contained in:
Jason Monk
2014-10-24 15:20:55 +00:00
committed by Android Git Automerger
parent 1aa2876c37 730409c332
commit b22d1002d1
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); task = mStackSupervisor.anyTaskForIdLocked(task.taskId);
if (task != null) { if (task != null) {
if (!isSystemInitiated if (!isSystemInitiated
&& ((mFocusedActivity == null) || (task != mFocusedActivity.task))) { && ((mStackSupervisor.getFocusedStack() == null)
|| (task != mStackSupervisor.getFocusedStack().topTask()))) {
throw new IllegalArgumentException("Invalid task, not in foreground"); throw new IllegalArgumentException("Invalid task, not in foreground");
} }
mStackSupervisor.setLockTaskModeLocked(task, !isSystemInitiated); mStackSupervisor.setLockTaskModeLocked(task, !isSystemInitiated);