diff options
| author | 2021-10-15 09:52:32 -0400 | |
|---|---|---|
| committer | 2021-10-15 09:53:24 -0400 | |
| commit | 9fec4869c856f58fa8bb6930e9991f93fc42b1b7 (patch) | |
| tree | 5da519c7f41220c1fc2dd0ab54329e4c0feb7472 | |
| parent | 626348ae43f6927dd2bc9b17cf7a3f9810ccf119 (diff) | |
Fix FalsingManager when a11y is on.
Replaces AccessibilityManager.isEnabled() with
AccessibilityManager.isTouchExplorationEnabled(), which is more
correct. The wrong method was selected when it was first checked in.
Fixes: 203034281
Test: manual
Change-Id: Ic73d535df98a15e0771fb394e91d2191f834f5c2
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java index 37a6cfaabb5e..0a9329845b23 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java @@ -330,7 +330,7 @@ public class BrightLineFalsingManager implements FalsingManager { || mTestHarness || mDataProvider.isJustUnlockedWithFace() || mDataProvider.isDocked() - || mAccessibilityManager.isEnabled(); + || mAccessibilityManager.isTouchExplorationEnabled(); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java index c4f480d7e7aa..55ee433c8d9d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java @@ -91,7 +91,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { @Test public void testA11yDisablesGesture() { assertThat(mBrightLineFalsingManager.isFalseTap(1)).isTrue(); - when(mAccessibilityManager.isEnabled()).thenReturn(true); + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true); assertThat(mBrightLineFalsingManager.isFalseTap(1)).isFalse(); } @@ -99,7 +99,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { @Test public void testA11yDisablesTap() { assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue(); - when(mAccessibilityManager.isEnabled()).thenReturn(true); + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true); assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse(); } @@ -107,7 +107,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { @Test public void testA11yDisablesDoubleTap() { assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isTrue(); - when(mAccessibilityManager.isEnabled()).thenReturn(true); + when(mAccessibilityManager.isTouchExplorationEnabled()).thenReturn(true); assertThat(mBrightLineFalsingManager.isFalseDoubleTap()).isFalse(); } |