Make sure tap detector is valid before trying to initialize.

Bug: 25879224
Change-Id: Iefebeec9a0c75fe25d4e2476b797a003670b047a

1 files changed, 3 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 395962c920ae..66bc98ef8d7d 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7385,7 +7385,9 @@ public class WindowManagerService extends IWindowManager.Stub
             if (displayContent != null) {
                 mAnimator.addDisplayLocked(displayId);
                 displayContent.initializeDisplayBaseInfo();
-                displayContent.mTapDetector.init();
+                if (displayContent.mTapDetector != null) {
+                    displayContent.mTapDetector.init();
+                }
             }
         }
     }