Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42dc85a8 authored by Jason Monk's avatar Jason Monk
Browse files

Make lock task check if focused better 

Previously using mFocusedActivity, which doesn't seem to update
until after touch (or something).  This now uses
StackSupervisor.getFocusedStack(), which seems to be working ok.

Bug: 17469165
Change-Id: Id06a27addeac1576a71fbc0d8ade1bd87e97b0cb
parent a9a550dd

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);