Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 042ccec5 authored by Svetoslav's avatar Svetoslav
Browse files

Dynamically togglable accessibility features improperly handled. 

Touch exploration and enhanced web accessibility can be toggled at
run time. However, the code that updates the state of these features
was not properly doing that. In particular, it did not write to the
settings if the feature gets disabled. Now the logic is much cleaner.
If there is a service that can request and requests a feature and
the feature is not enabled, we enabled it, otherwise the feature is
disabled.

bug:8790771

Change-Id: I218dfa12fd02220c94940b54f42bed578811a794
parent 4c95c537

services/java/com/android/server/accessibility/AccessibilityManagerService.java

+30 −37
Original line number Original line Diff line number Diff line
@@ -1375,29 +1375,30 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
    }

    }





    private void updateTouchExplorationLocked(UserState userState) {

    private void updateTouchExplorationLocked(UserState userState) {

        userState.mIsTouchExplorationEnabled = false;

        boolean enabled = false;

        final int serviceCount = userState.mBoundServices.size();

        final int serviceCount = userState.mBoundServices.size();

        for (int i = 0; i < serviceCount; i++) {

        for (int i = 0; i < serviceCount; i++) {

            Service service = userState.mBoundServices.get(i);

            Service service = userState.mBoundServices.get(i);

            if (tryEnableTouchExplorationLocked(service)) {

            if (canRequestAndRequestsTouchExplorationLocked(service)) {

                enabled = true;

                break;

                break;

            }

            }

        }

        }

        if (enabled != userState.mIsTouchExplorationEnabled) {

            userState.mIsTouchExplorationEnabled = enabled;

            Settings.Secure.putIntForUser(mContext.getContentResolver(),

                    Settings.Secure.TOUCH_EXPLORATION_ENABLED, enabled ? 1 : 0,

                    userState.mUserId);

        }

    }

    }





    private boolean tryEnableTouchExplorationLocked(Service service) {

    private boolean canRequestAndRequestsTouchExplorationLocked(Service service) {

        // Service not ready or cannot request the feature - well nothing to do.

        if (!service.canReceiveEventsLocked() || !service.mRequestTouchExplorationMode) {

        if (!service.canReceiveEventsLocked() || !service.mRequestTouchExplorationMode) {

            return false;

            return false;

        }

        }

        UserState userState = getUserStateLocked(service.mUserId);

        if (userState.mIsTouchExplorationEnabled) {

            return false;

        }

        // UI test automation service can always enable it.

        // UI test automation service can always enable it.

        if (service.mIsAutomation) {

        if (service.mIsAutomation) {

            userState.mIsTouchExplorationEnabled = true;

            Settings.Secure.putIntForUser(mContext.getContentResolver(),

                    Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1, service.mUserId);

            return true;

            return true;

        }

        }

        if (service.mResolveInfo.serviceInfo.applicationInfo.targetSdkVersion

        if (service.mResolveInfo.serviceInfo.applicationInfo.targetSdkVersion
@@ -1405,29 +1406,21 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
            // Up to JB-MR1 we had a white list with services that can enable touch

            // Up to JB-MR1 we had a white list with services that can enable touch

            // exploration. When a service is first started we show a dialog to the

            // exploration. When a service is first started we show a dialog to the

            // use to get a permission to white list the service.

            // use to get a permission to white list the service.

            if (!userState.mTouchExplorationGrantedServices.contains(service.mComponentName)) {

            UserState userState = getUserStateLocked(service.mUserId);

                if (mEnableTouchExplorationDialog == null

            if (userState.mTouchExplorationGrantedServices.contains(service.mComponentName)) {

                        || (mEnableTouchExplorationDialog != null

                return true;

                            && !mEnableTouchExplorationDialog.isShowing())) {

            } else if (mEnableTouchExplorationDialog == null

                    || !mEnableTouchExplorationDialog.isShowing()) {

                mMainHandler.obtainMessage(

                mMainHandler.obtainMessage(

                        MainHandler.MSG_SHOW_ENABLED_TOUCH_EXPLORATION_DIALOG,

                        MainHandler.MSG_SHOW_ENABLED_TOUCH_EXPLORATION_DIALOG,

                        service).sendToTarget();

                        service).sendToTarget();

            }

            }

            } else {

                userState.mIsTouchExplorationEnabled = true;

                Settings.Secure.putIntForUser(mContext.getContentResolver(),

                        Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1, service.mUserId);

                return true;

            }

        } else {

        } else {

            // Starting in JB-MR2 we request an accessibility service to declare

            // Starting in JB-MR2 we request an accessibility service to declare

            // certain capabilities in its meta-data to allow it to enable the

            // certain capabilities in its meta-data to allow it to enable the

            // corresponding features.

            // corresponding features.

            if (service.mIsAutomation || (service.mAccessibilityServiceInfo.getCapabilities()

            if ((service.mAccessibilityServiceInfo.getCapabilities()

                    & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION) != 0) {

                    & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION) != 0) {

                userState.mIsTouchExplorationEnabled = true;

                Settings.Secure.putIntForUser(mContext.getContentResolver(),

                        Settings.Secure.TOUCH_EXPLORATION_ENABLED, 1, service.mUserId);

                return true;

                return true;

            }

            }

        }

        }
@@ -1435,29 +1428,29 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
    }

    }





    private void updateEnhancedWebAccessibilityLocked(UserState userState) {

    private void updateEnhancedWebAccessibilityLocked(UserState userState) {

        userState.mIsEnhancedWebAccessibilityEnabled = false;

        boolean enabled = false;

        final int serviceCount = userState.mBoundServices.size();

        final int serviceCount = userState.mBoundServices.size();

        for (int i = 0; i < serviceCount; i++) {

        for (int i = 0; i < serviceCount; i++) {

            Service service = userState.mBoundServices.get(i);

            Service service = userState.mBoundServices.get(i);

            if (tryEnableEnhancedWebAccessibilityLocked(service)) {

            if (canRequestAndRequestsEnhancedWebAccessibilityLocked(service)) {

                return;

                enabled = true;

                break;

            }

            }

        }

        }

        if (enabled != userState.mIsEnhancedWebAccessibilityEnabled) {

            userState.mIsEnhancedWebAccessibilityEnabled = enabled;

            Settings.Secure.putIntForUser(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, enabled ? 1 : 0,

                    userState.mUserId);

        }

    }

    }





    private boolean tryEnableEnhancedWebAccessibilityLocked(Service service) {

    private boolean canRequestAndRequestsEnhancedWebAccessibilityLocked(Service service) {

        if (!service.canReceiveEventsLocked() || !service.mRequestEnhancedWebAccessibility ) {

        if (!service.canReceiveEventsLocked() || !service.mRequestEnhancedWebAccessibility ) {

            return false;

            return false;

        }

        }

        UserState userState = getUserStateLocked(service.mUserId);

        if (userState.mIsEnhancedWebAccessibilityEnabled) {

            return false;

        }

        if (service.mIsAutomation || (service.mAccessibilityServiceInfo.getCapabilities()

        if (service.mIsAutomation || (service.mAccessibilityServiceInfo.getCapabilities()

               & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY) != 0) {

               & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY) != 0) {

            userState.mIsEnhancedWebAccessibilityEnabled = true;

            Settings.Secure.putIntForUser(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, 1, userState.mUserId);

            return true;

            return true;

        }

        }

        return false;

        return false;