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

Commit 441b57bc authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 593a4e6f: Fix NPE when destroyActivity occurs after detach. 

* commit '593a4e6f':
  Fix NPE when destroyActivity occurs after detach.
parents fc8fa54f 593a4e6f

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

+4 −2
Original line number Diff line number Diff line
@@ -3661,10 +3661,12 @@ final class ActivityStack { 
            if (isOnHomeDisplay()) {

                mStackSupervisor.moveHomeStack(!isHomeStack());

            }

            if (mStacks != null) {

                mStacks.remove(this);

                mStacks.add(0, this);

            }

        }

    }



    TaskRecord createTaskRecord(int taskId, ActivityInfo info, Intent intent, boolean toTop) {

        TaskRecord task = new TaskRecord(taskId, info, intent);