Merge "Fixed NPE when trying to resize stack with no running activity."

1 files changed, 2 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index b989bc630a1b..58104a8e0a5e 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2606,9 +2606,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
         }
 
         final ActivityRecord r = stack.topRunningActivityLocked(null);
-        final TaskRecord topTask = r.task;
-        if (!topTask.mResizeable) {
-            Slog.w(TAG, "resizeStack: top task " + topTask + " not resizeable.");
+        if (r != null && !r.task.mResizeable) {
+            Slog.w(TAG, "resizeStack: top task " + r.task + " not resizeable.");
             return;
         }