commit b60206a5e799acd77999824856a641e57fe3e447
author Wale Ogunwale <ogunwale@google.com> Thu Dec 03 02:18:44 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 03 02:18:44 2015 +0000
tree 546a32ed6824bf5442e2d6c3b7f27a8010d2d883
parent aa8b1c35add23922ff394e0193ba24cb15bd34f3
parent abaa4ad84e6e09b16621c8d14630314cbcd1fdfa

Merge "Make sure tap detector is valid before trying to initialize."

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 1bb5ad0..707450c 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7400,7 +7400,9 @@
             if (displayContent != null) {
                 mAnimator.addDisplayLocked(displayId);
                 displayContent.initializeDisplayBaseInfo();
-                displayContent.mTapDetector.init();
+                if (displayContent.mTapDetector != null) {
+                    displayContent.mTapDetector.init();
+                }
             }
         }
     }