summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2017-04-13 16:03:34 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2017-04-14 02:31:53 +0000
commit3a74243ae4ee3944340d4e4fcbefd3d8d200373c (patch)
tree297878cef5aeb9226b928dd8f1b68214d515882e /core/java/android
parent9b2ed2b7c48f80f8b8968616447b966ba6fe9c2a (diff)
Check for non-null parent before delegating to it
Test: manual bug:37289681 Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/View.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9072bf93d9d8..8b3e3fe17cc0 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -6970,7 +6970,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
dispatchPopulateAccessibilityEvent(event);
}
// In the beginning we called #isShown(), so we know that getParent() is not null.
- getParent().requestSendAccessibilityEvent(this, event);
+ ViewParent parent = getParent();
+ if (parent != null) {
+ getParent().requestSendAccessibilityEvent(this, event);
+ }
}
/**