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

Commit 593a4e6f authored by Craig Mautner's avatar Craig Mautner
Browse files

Fix NPE when destroyActivity occurs after detach. 

 *** FATAL EXCEPTION IN SYSTEM PROCESS: ActivityManager
 java.lang.NullPointerException
 	at com.android.server.am.ActivityStack.removeTask(ActivityStack.java:3627)
 	at com.android.server.am.ActivityStack.removeActivityFromHistoryLocked(ActivityStack.java:2693)
 	at com.android.server.am.ActivityStack.activityDestroyedLocked(ActivityStack.java:2878)
 	at com.android.server.am.ActivityStack$ActivityStackHandler.handleMessage(ActivityStack.java:296)
 	at android.os.Handler.dispatchMessage(Handler.java:102)
 	at android.os.Looper.loop(Looper.java:136)
 	at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1868)

Change-Id: Ifaf0fe6c62d1f63897d57dc96b4d86d8111b45db
parent e9ddaa0b

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

+4 −2
Original line number Diff line number Diff line
@@ -3624,10 +3624,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);