am e5ea48a7: Fix a race in accessibility manager.

* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.

core/java/android/view/accessibility/AccessibilityManager.java

@@ -459,7 +459,7 @@ public final class AccessibilityManager {
      */
     public boolean addAccessibilityStateChangeListener(
             @NonNull AccessibilityStateChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mAccessibilityStateChangeListeners.add(listener);
     }
 
@@ -471,7 +471,7 @@ public final class AccessibilityManager {
      */
     public boolean removeAccessibilityStateChangeListener(
             @NonNull AccessibilityStateChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mAccessibilityStateChangeListeners.remove(listener);
     }
 
@@ -484,7 +484,7 @@ public final class AccessibilityManager {
      */
     public boolean addTouchExplorationStateChangeListener(
             @NonNull TouchExplorationStateChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mTouchExplorationStateChangeListeners.add(listener);
     }
 
@@ -496,7 +496,7 @@ public final class AccessibilityManager {
      */
     public boolean removeTouchExplorationStateChangeListener(
             @NonNull TouchExplorationStateChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mTouchExplorationStateChangeListeners.remove(listener);
     }
 
@@ -511,7 +511,7 @@ public final class AccessibilityManager {
      */
     public boolean addHighTextContrastStateChangeListener(
             @NonNull HighTextContrastChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mHighTextContrastStateChangeListeners.add(listener);
     }
 
@@ -525,7 +525,7 @@ public final class AccessibilityManager {
      */
     public boolean removeHighTextContrastStateChangeListener(
             @NonNull HighTextContrastChangeListener listener) {
-        // Final CopyOnArrayList - no lock needed.
+        // Final CopyOnWriteArrayList - no lock needed.
         return mHighTextContrastStateChangeListeners.remove(listener);
     }
 
@@ -640,9 +640,9 @@ public final class AccessibilityManager {
         synchronized (mLock) {
             isEnabled = mIsEnabled;
         }
-        final int listenerCount = mAccessibilityStateChangeListeners.size();
+        // Listeners are a final CopyOnWriteArrayList, hence no lock needed.
-        for (int i = 0; i < listenerCount; i++) {
+        for (AccessibilityStateChangeListener listener :mAccessibilityStateChangeListeners) {
-            mAccessibilityStateChangeListeners.get(i).onAccessibilityStateChanged(isEnabled);
+            listener.onAccessibilityStateChanged(isEnabled);
         }
     }
 
@@ -654,10 +654,9 @@ public final class AccessibilityManager {
         synchronized (mLock) {
             isTouchExplorationEnabled = mIsTouchExplorationEnabled;
         }
-        final int listenerCount = mTouchExplorationStateChangeListeners.size();
+        // Listeners are a final CopyOnWriteArrayList, hence no lock needed.
-        for (int i = 0; i < listenerCount; i++) {
+        for (TouchExplorationStateChangeListener listener :mTouchExplorationStateChangeListeners) {
-            mTouchExplorationStateChangeListeners.get(i)
+            listener.onTouchExplorationStateChanged(isTouchExplorationEnabled);
-                    .onTouchExplorationStateChanged(isTouchExplorationEnabled);
         }
     }
 
@@ -669,10 +668,9 @@ public final class AccessibilityManager {
         synchronized (mLock) {
             isHighTextContrastEnabled = mIsHighTextContrastEnabled;
         }
-        final int listenerCount = mHighTextContrastStateChangeListeners.size();
+        // Listeners are a final CopyOnWriteArrayList, hence no lock needed.
-        for (int i = 0; i < listenerCount; i++) {
+        for (HighTextContrastChangeListener listener : mHighTextContrastStateChangeListeners) {
-            mHighTextContrastStateChangeListeners.get(i)
+            listener.onHighTextContrastStateChanged(isHighTextContrastEnabled);
-                    .onHighTextContrastStateChanged(isHighTextContrastEnabled);
         }
     }