Fix NPE

am: 4b81252610 Change-Id: Iacf933a5c137cde4ca8215588be2dd6583641cc3
2016-09-03 00:11:14 +00:00
parent 4ff27f97e9 4b81252610
commit 8b26f5ee31
1 changed files with 2 additions and 2 deletions
--- 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;