commit 594eeb082e548617ff5092496888c43457593c2b
author Robert Greenwalt <rgreenwalt@google.com> Thu Nov 14 00:22:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 14 00:22:46 2013 +0000
tree 2c7db390e9689975fd57157c327f4cea7ef6a06b
parent 1f0f9fa94913198cd79b8d350cf9e8df8001daeb
parent 92d02491aded7ca233fd52d586cc0b0bda4521cf

Merge "Fix for the invalid Global Proxy Setting" into klp-dev

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 fd791f9..0e15261 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3160,7 +3160,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);
         }