From fdcb865cf3f3a5c4ef3cab62ba4dbe6a49f52e4b Mon Sep 17 00:00:00 2001
From: Chris Hopman <cjhopman@fb.com>
Date: Wed, 22 Jun 2016 16:41:19 -0700
Subject: [PATCH] Fix sending accessibility events to RN modals

Reviewed By: dmmiller

Differential Revision: D3472359

fbshipit-source-id: c82d8e254cdd0531eb52805a6f00e63cf783fdc8
---
 .../facebook/react/views/modal/ReactModalHostView.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
index 48b66db9f97..ddf821d454e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java
@@ -21,6 +21,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.accessibility.AccessibilityEvent;
 
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
@@ -109,6 +110,13 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
     // Those will be handled by the mHostView which lives in the dialog
   }
 
+  @Override
+  public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
+    // Explicitly override this to prevent accessibility events being passed down to children
+    // Those will be handled by the mHostView which lives in the dialog
+    return false;
+  }
+
   public void onDropInstance() {
     ((ReactContext) getContext()).removeLifecycleEventListener(this);
     dismiss();