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

Commit afe8cf26 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Removing action arguments checks. 

1. The checks for action arguments are not needed since they
   may cause trouble for developers if we add more args to
   an action.

bug:6414006

Change-Id: Ia4212b52be183b1ef1cfd2561ce618cef2b015e4
parent 427db9b3

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

+1 −25
Original line number Diff line number Diff line
@@ -1765,8 +1765,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                Bundle arguments) {

            return canRetrieveWindowContent(service)

                && isRetrievalAllowingWindow(windowId)

                && isActionPermitted(action)

                && isActionArgumentsValid(action, arguments);

                && isActionPermitted(action);

        }



        public boolean canRetrieveWindowContent(Service service) {
@@ -1790,29 +1789,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
             return (VALID_ACTIONS & action) != 0;

        }



        private boolean isActionArgumentsValid(int action, Bundle arguments) {

            switch (action) {

                case AccessibilityNodeInfo.ACTION_NEXT_AT_GRANULARITY:

                case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_GRANULARITY: {

                    if (arguments.size() == 1) {

                        final int granularity = arguments.getInt(

                                AccessibilityNodeInfo.ACTION_ARGUMENT_GRANULARITY_INT);

                        return (granularity & VALID_GRANULARITIES) != 0

                                && Integer.bitCount(granularity) == 1;

                    }

                } break;

                case AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT:

                case AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT: {

                    if (arguments.size() == 1) {

                        String element = arguments.getString(

                                AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING);

                        return !TextUtils.isEmpty(element);

                    }

                } break;

            }

            return false;

        }



        private void enforceCallingPermission(String permission, String function) {

            if (OWN_PROCESS_ID == Binder.getCallingPid()) {

                return;