commit aaebbbff734cf65dcfd4489252948beca3d9225e
author Alexandra Gherghina <alexgherghina@google.com> Thu Mar 13 09:31:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 09:31:53 2014 +0000
tree 3a4429c17685e5ef5819b01dd54fb5121fe98266
parent e13cf5701529cd7229587b5546f4320f5b243368
parent dae57a14141a90d71332086c3d6e8bd3ebf84fe5

Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps."

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 9636de7..b2cf846 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2469,7 +2469,10 @@
             for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
                 final ActivityStack stack = stacks.get(stackNdx);
                 stack.switchUserLocked(userId);
-                mWindowManager.moveTaskToTop(stack.topTask().taskId);
+                TaskRecord task = stack.topTask();
+                if (task != null) {
+                    mWindowManager.moveTaskToTop(task.taskId);
+                }
             }
         }
 
@@ -2480,7 +2483,10 @@
         final boolean homeInFront = stack.isHomeStack();
         if (stack.isOnHomeDisplay()) {
             moveHomeStack(homeInFront);
-            mWindowManager.moveTaskToTop(stack.topTask().taskId);
+            TaskRecord task = stack.topTask();
+            if (task != null) {
+                mWindowManager.moveTaskToTop(task.taskId);
+            }
         } else {
             // Stack was moved to another display while user was swapped out.
             resumeHomeActivity(null);