Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check in a11y callback" into oc-mr1-dev

Browse Source 
am: 4dfeb4f0e4

Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511
This commit is contained in:
Phil Weaver
2017-09-26 19:30:28 +00:00
committed by android-build-merger
parent 9adc60ffe0 4dfeb4f0e4
commit 0e8e7830fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewRootImpl.java
View File

@@ -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) {