Fixing bugs due to the new custom accessibility action APIs.

1. AccessibiltiyAction was incorectly throwing an exception when
   a custom action was constructed.

2. AccessibilityManagerService should no longer enforce only standard
   actions as we allow custom ones too.

bug:15110963

Change-Id: Iea57e0a6449b87bd8d103c55ca255e80705f2565

1 files changed, 1 insertions, 10 deletions

diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index d5f0834267f0..66cc3f6b31d5 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -318,11 +318,6 @@ public class AccessibilityNodeInfo implements Parcelable {
      */
     private static final int ACTION_TYPE_MASK = 0xFF000000;
 
-    /**
-     * Mask to define standard not legacy actions.
-     */
-    private static final int STANDARD_NON_LEGACY_ACTION_MASK = 0x01000000;
-
     // Action arguments
 
     /**
@@ -3262,14 +3257,10 @@ public class AccessibilityNodeInfo implements Parcelable {
          * @param label The label for the new AccessibilityAction.
          */
         public AccessibilityAction(int actionId, @Nullable CharSequence label) {
-            if ((actionId & ACTION_TYPE_MASK) == 0 && Integer.bitCount(actionId) > 1) {
+            if ((actionId & ACTION_TYPE_MASK) == 0 && Integer.bitCount(actionId) != 1) {
                 throw new IllegalArgumentException("Invalid standard action id");
             }
 
-            if ((actionId & STANDARD_NON_LEGACY_ACTION_MASK) != 0) {
-                throw new IllegalArgumentException("action id not a resource id");
-            }
-
             mActionId = actionId;
             mLabel = label;
         }