From 4b812526104f060aefe5cca029786bf11977b0b1 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Fri, 2 Sep 2016 16:55:25 -0700
Subject: [PATCH] Fix NPE

bug:30150688

Change-Id: I2ae0cb76b2f6f0b47241bccc6922f1034183cc75
---
 .../core/java/com/android/server/wm/WindowManagerService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 525192e069752..4372deaf44259 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9913,8 +9913,8 @@ public class WindowManagerService extends IWindowManager.Stub
             // We may need to schedule some toast windows to be removed. The
             // toasts for an app that does not have input focus are removed
             // within a timeout to prevent apps to redress other apps' UI.
-            oldFocus.getDisplayContent().scheduleToastWindowsTimeoutIfNeededLocked(
-                    oldFocus, newFocus);
+            getDefaultDisplayContentLocked().scheduleToastWindowsTimeoutIfNeededLocked(
+                        oldFocus, newFocus);
 
             Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
             return true;