From 1bef389f70de89d82189b94967eccee9b3b58d68 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Tue, 17 Feb 2015 15:09:47 -0800
Subject: [PATCH] Fix NPE in DisplayContent.setTouchExcludeRegion.
DisplayContent.mTapDetector is null for any non-default display. When
testing ActivityView DisplayContent.setTouchExcludeRegion() throws an
NPE when dereferencing mTapDetector.
This change adds a null test to avoid the NPE.
Fixes bug 19413700.
Change-Id: I48a66c0ed071c87b38b354eead58a4de97fb47b9
---
services/core/java/com/android/server/wm/DisplayContent.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 05f347313ecb4..f073c23878a6a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -241,7 +241,9 @@ class DisplayContent {
mTouchExcludeRegion.op(mTmpRect, Region.Op.DIFFERENCE);
}
}
- mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion);
+ if (mTapDetector != null) {
+ mTapDetector.setTouchExcludeRegion(mTouchExcludeRegion);
+ }
}
void switchUserStacks() {
--
GitLab