From 098a1f4c472e0758129811d02f5709bd5472bed1 Mon Sep 17 00:00:00 2001 From: Phil Weaver Date: Mon, 15 May 2017 17:59:26 -0700 Subject: [PATCH] Fix infinite loop in LinkAccessibilityHelper Not that this, this this. Bug: 38315555 Test: Turned on TalkBack, opened Wifi settings. No longer crashes. Change-Id: Ib7e756bfc41a5b1cf17c4685d7846dd72b60d102 --- .../util/LinkAccessibilityHelper.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java index 1bfd4c7..1e663d6 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java +++ b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java @@ -78,31 +78,34 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat { mExploreByTouchHelper = new ExploreByTouchHelper(view) { @Override protected int getVirtualViewAt(float x, float y) { - return this.getVirtualViewAt(x, y); + return LinkAccessibilityHelper.this.getVirtualViewAt(x, y); } @Override protected void getVisibleVirtualViews(List virtualViewIds) { - this.getVisibleVirtualViews(virtualViewIds); + LinkAccessibilityHelper.this.getVisibleVirtualViews(virtualViewIds); } @Override protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) { - this.onPopulateEventForVirtualView(virtualViewId, event); + LinkAccessibilityHelper + .this.onPopulateEventForVirtualView(virtualViewId, event); } @Override protected void onPopulateNodeForVirtualView(int virtualViewId, AccessibilityNodeInfoCompat infoCompat) { - this.onPopulateNodeForVirtualView(virtualViewId, infoCompat); + LinkAccessibilityHelper + .this.onPopulateNodeForVirtualView(virtualViewId, infoCompat); } @Override protected boolean onPerformActionForVirtualView(int virtualViewId, int action, Bundle arguments) { - return this.onPerformActionForVirtualView(virtualViewId, action, arguments); + return LinkAccessibilityHelper.this + .onPerformActionForVirtualView(virtualViewId, action, arguments); } }; } else {