Merge "Fixed NPE when pause is complete on a dead app." into nyc-mr1-dev

2016-09-14 13:49:57 +00:00
parent 4efd735a76 e852400e1b
commit 5db4e723cd
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1308,7 +1308,9 @@ final class ActivityStack {
            // It is possible the activity was freezing the screen before it was paused.
            // In that case go ahead and remove the freeze this activity has on the screen
            // since it is no longer visible.
-            prev.stopFreezingScreenLocked(true /*force*/);
+            if (prev != null) {
+                prev.stopFreezingScreenLocked(true /*force*/);
+            }
            mPausingActivity = null;
        }