Android shouldn't fire focus events when the WebView itself isn't focused

content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java

Index: content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
index 1c34c0fc34a55cbe923123d1ab9b62800e53409a..b8d75208a34e429957c00391346f9906d37f398f 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
@@ -683,13 +683,16 @@ public class BrowserAccessibilityManager {
     @CalledByNative
     private void handleFocusChanged(int id) {
         if (mNativeObj == 0) return;
-        sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_FOCUSED);
-        moveAccessibilityFocusToId(id);
+        if (mAccessibilityFocusId != View.NO_ID) {
+            sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_FOCUSED);
+            moveAccessibilityFocusToId(id);
+        }
     }
 
     @CalledByNative
     private void handleCheckStateChanged(int id) {
         if (mNativeObj == 0) return;
+        if (mAccessibilityFocusId == View.NO_ID) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_CLICKED);
     }
 
@@ -702,18 +705,21 @@ public class BrowserAccessibilityManager {
     @CalledByNative
     private void handleTextSelectionChanged(int id) {
         if (mNativeObj == 0) return;
+        if (mAccessibilityFocusId == View.NO_ID) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED);
     }
 
     @CalledByNative
     private void handleEditableTextChanged(int id) {
         if (mNativeObj == 0) return;
+        if (mAccessibilityFocusId == View.NO_ID) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
     }
 
     @CalledByNative
     private void handleSliderChanged(int id) {
         if (mNativeObj == 0) return;
+        if (mAccessibilityFocusId == View.NO_ID) return;
         sendAccessibilityEvent(id, AccessibilityEvent.TYPE_VIEW_SCROLLED);
     }
 
@@ -748,7 +754,9 @@ public class BrowserAccessibilityManager {
     @CalledByNative
     private void handleScrolledToAnchor(int id) {
         if (mNativeObj == 0) return;
-        moveAccessibilityFocusToId(id);
+        if (mAccessibilityFocusId != View.NO_ID) {
+            moveAccessibilityFocusToId(id);
+        }
     }
 
     @CalledByNative
@@ -767,6 +775,7 @@ public class BrowserAccessibilityManager {
 
     @CalledByNative
     private void announceLiveRegionText(String text) {
+        if (mAccessibilityFocusId == View.NO_ID) return;
         mView.announceForAccessibility(text);
     }