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

Commit ea1e8ecf authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Don't kill process when dismissing stack 

Also clear the binder identity to incorrect permission
checks, which lead to crashes when dismissing the docked
stack.

Change-Id: I53175769745e8bbdbc296806b9297eb3c53d4452
parent 8f3978fc

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

+3 −1
Original line number Diff line number Diff line
@@ -17444,14 +17444,16 @@ public final class ActivityManagerService extends ActivityManagerNative 
            throw new IllegalArgumentException("Removing home stack is not allowed.");

        }

        synchronized (this) {

            long origId = Binder.clearCallingIdentity();

            ActivityStack stack = mStackSupervisor.getStack(stackId);

            if (stack != null) {

                ArrayList<TaskRecord> tasks = stack.getAllTasks();

                for (int i = tasks.size() - 1; i >= 0; i--) {

                    removeTaskByIdLocked(tasks.get(i).taskId, true /* killProcess */,

                    removeTaskByIdLocked(tasks.get(i).taskId, false /* killProcess */,

                            !REMOVE_FROM_RECENTS);

                }

            }

            Binder.restoreCallingIdentity(origId);

        }

    }