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

Remove global gesture code

Browse Source 
The global gesture to enable a11y is obsolete with the shortcut.
Remove the aidl method and implementation in AccessibilityManagerService

Test: builds and run CTS suite
Bug: 237687851
Change-Id: I9390e6e4a82d638046fd6adcbacb7a8b5fc8cbf4
This commit is contained in:
sallyyuen
2022-07-01 08:56:42 -07:00
parent e87bf5f53e
commit 521600d062
2 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/accessibility/IAccessibilityManager.aidl
View File

@@ -63,9 +63,6 @@ interface IAccessibilityManager {
void unregisterUiTestAutomationService(IAccessibilityServiceClient client);
void temporaryEnableAccessibilityStateUntilKeyguardRemoved(in ComponentName service,
boolean touchExplorationEnabled);
// Used by UiAutomation
IBinder getWindowToken(int windowId, int userId);

43
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -199,9 +199,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
private static final String FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE =
"registerUiTestAutomationService";
private static final String TEMPORARY_ENABLE_ACCESSIBILITY_UNTIL_KEYGUARD_REMOVED =
"temporaryEnableAccessibilityStateUntilKeyguardRemoved";
private static final String GET_WINDOW_TOKEN = "getWindowToken";
private static final String SET_PIP_ACTION_REPLACEMENT =
@@ -1234,46 +1231,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
}
@Override
public void temporaryEnableAccessibilityStateUntilKeyguardRemoved(
ComponentName service, boolean touchExplorationEnabled) {
if (mTraceManager.isA11yTracingEnabledForTypes(FLAGS_ACCESSIBILITY_MANAGER)) {
mTraceManager.logTrace(
LOG_TAG + ".temporaryEnableAccessibilityStateUntilKeyguardRemoved",
FLAGS_ACCESSIBILITY_MANAGER,
"service=" + service + ";touchExplorationEnabled=" + touchExplorationEnabled);
}
mSecurityPolicy.enforceCallingPermission(
Manifest.permission.TEMPORARY_ENABLE_ACCESSIBILITY,
TEMPORARY_ENABLE_ACCESSIBILITY_UNTIL_KEYGUARD_REMOVED);
if (mTraceManager.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MANAGER_INTERNAL)) {
mTraceManager.logTrace("WindowManagerInternal.isKeyguardLocked",
FLAGS_WINDOW_MANAGER_INTERNAL);
}
if (!mWindowManagerService.isKeyguardLocked()) {
return;
}
synchronized (mLock) {
// Set the temporary state.
AccessibilityUserState userState = getCurrentUserStateLocked();
userState.setTouchExplorationEnabledLocked(touchExplorationEnabled);
userState.setDisplayMagnificationEnabledLocked(false);
userState.disableShortcutMagnificationLocked();
userState.setAutoclickEnabledLocked(false);
userState.mEnabledServices.clear();
userState.mEnabledServices.add(service);
userState.getBindingServicesLocked().clear();
userState.getCrashedServicesLocked().clear();
userState.mTouchExplorationGrantedServices.clear();
userState.mTouchExplorationGrantedServices.add(service);
// User the current state instead settings.
onUserStateChangedLocked(userState);
}
}
@Override
public IBinder getWindowToken(int windowId, int userId) {
if (mTraceManager.isA11yTracingEnabledForTypes(FLAGS_ACCESSIBILITY_MANAGER)) {