commit ada62fca51d314cefe2c5da4e007df5b9abf320d
author Craig Mautner <cmautner@google.com> Wed Nov 13 15:06:15 2013 -0800
committer Craig Mautner <cmautner@google.com> Wed Nov 13 15:09:55 2013 -0800
tree f0dcd5cfe1e3eb0e10273069768213975d0db312
parent 48dab493b927f4a71687ccd557084ccee195de73

Add null pointer check.

Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092

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

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 569440d..62e4210 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3158,7 +3158,9 @@
 
         final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;
         if (task == tr && task.mOnTopOfHome || numTasks <= 1) {
-            task.mOnTopOfHome = false;
+            if (task != null) {
+                task.mOnTopOfHome = false;
+            }
             return mStackSupervisor.resumeHomeActivity(null);
         }