commit 9e065121fa4cd7443c648f29c2f4c3a276041be8
author Svetoslav <svetoslavganov@google.com> Fri Feb 15 15:24:09 2013 -0800
committer Svetoslav <svetoslavganov@google.com> Fri Feb 15 15:24:13 2013 -0800
tree b56b5be557a1070e81ebc4f65e162601b6d93d29
parent 00e592272ee44cba41832e3cf0a0ffb2de56585d

Dynamically configurable accessibility flags mishandled.

A bug was preventing clearing dynamically settable accessibility
service flags.

bug:8051095

Change-Id: I6844b2f44e323bc741ac39983a892f1d28f3132b

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

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index e5cba62..9c02a46 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1640,14 +1640,18 @@
 
             if (mIsAutomation || info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion
                     >= Build.VERSION_CODES.JELLY_BEAN) {
-                mFetchFlags |= (info.flags
-                        & AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS) != 0 ?
-                                AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS : 0;
+                if ((info.flags & AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS) != 0) {
+                    mFetchFlags |= AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
+                } else {
+                    mFetchFlags &= ~AccessibilityNodeInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
+                }
             }
 
-            mFetchFlags |= (info.flags
-                    & AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS) != 0 ?
-                            AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS : 0;
+            if ((info.flags & AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS) != 0) {
+                mFetchFlags |= AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS;
+            } else {
+                mFetchFlags &= ~AccessibilityNodeInfo.FLAG_REPORT_VIEW_IDS;
+            }
 
             if (mResolveInfo != null) {
                 mRequestTouchExplorationMode = (info.flags