Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when destroyActivity occurs after detach.

Browse Source 
*** 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
This commit is contained in:
Craig Mautner
2014-01-15 17:55:51 -08:00
parent e9ddaa0b18
commit 593a4e6f98
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -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);
}
}
}