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

Fix FalsingManager when a11y is on.

Browse Source 
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
This commit is contained in:
Dave Mankoff
2021-10-15 09:52:32 -04:00
parent 626348ae43
commit 9fec4869c8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
View File

@@ -330,7 +330,7 @@ public class BrightLineFalsingManager implements FalsingManager {
|| mTestHarness
|| mDataProvider.isJustUnlockedWithFace()
|| mDataProvider.isDocked()
|| mAccessibilityManager.isEnabled();
|| mAccessibilityManager.isTouchExplorationEnabled();
}
@Override

6
packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java
View File

@@ -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();
}