From ada62fca51d314cefe2c5da4e007df5b9abf320d Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Wed, 13 Nov 2013 15:06:15 -0800
Subject: Add null pointer check.

Fixes bug 11673948.

Change-Id: I60b590b9793ae1b8d5c3d343f4bb6cb40ba4a092
---
 services/java/com/android/server/am/ActivityStack.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 569440d95214..62e42107ae44 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3158,7 +3158,9 @@ final class ActivityStack {
 
         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);
         }
 
-- 
cgit v1.2.3-59-g8ed1b