OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dbe5afd
)
Add null check in a11y callback
author
Phil Weaver
<pweaver@google.com>
Fri, 22 Sep 2017 18:03:06 +0000
(11:03 -0700)
committer
Phil Weaver
<pweaver@google.com>
Fri, 22 Sep 2017 20:09:14 +0000
(20:09 +0000)
Bug:
65475473
Test: Verified it still builds
Change-Id: I9ad1249c44cb73153066f67164c90333779d284e
core/java/android/view/ViewRootImpl.java
patch
|
blob
|
history
diff --git
a/core/java/android/view/ViewRootImpl.java
b/core/java/android/view/ViewRootImpl.java
index
22faeed
..
8f250a9
100644
(file)
--- a/
core/java/android/view/ViewRootImpl.java
+++ b/
core/java/android/view/ViewRootImpl.java
@@
-7714,7
+7714,7
@@
public final class ViewRootImpl implements ViewParent,
public void onAccessibilityStateChanged(boolean enabled) {
if (enabled) {
ensureConnection();
- if (mAttachInfo.mHasWindowFocus) {
+ if (mAttachInfo.mHasWindowFocus
&& (mView != null)
) {
mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
View focusedView = mView.findFocus();
if (focusedView != null && focusedView != mView) {