Manual merge of ag/2264818 from master
I can't tell if this code ever executes on O, but I don't
want to leave an infinite loop lying around.
Fix infinite loop in LinkAccessibilityHelper
Not that this, this this.
Bug: 38315555
Test: Just build verification.
Change-Id: Ib7e756bfc41a5b1cf17c4685d7846dd72b60d102
diff --git a/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
index 3866551..d714eb8 100644
--- a/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
+++ b/library/eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java
@@ -79,31 +79,34 @@
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<Integer> 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 {
