From 593a4e6f982cecddc3f2f6107044b5e12fab3e20 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Wed, 15 Jan 2014 17:55:51 -0800 Subject: [PATCH] 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 --- services/core/java/com/android/server/am/ActivityStack.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index c9d62224c3c2d..d689a29913a77 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3624,8 +3624,10 @@ final class ActivityStack { if (isOnHomeDisplay()) { mStackSupervisor.moveHomeStack(!isHomeStack()); } - mStacks.remove(this); - mStacks.add(0, this); + if (mStacks != null) { + mStacks.remove(this); + mStacks.add(0, this); + } } }