-
Notifications
You must be signed in to change notification settings - Fork 24.7k
[Android] Fix ConcurrentModificationException in InteropUIBlockListener #51631
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Android] Fix ConcurrentModificationException in InteropUIBlockListener #51631
Conversation
Hi @jkoutavas! Thank you for your pull request and welcome to our community. Action RequiredIn order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you. ProcessIn order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA. Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with If you have received this in error or have any questions, please contact us at [email protected]. Thanks! |
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
I did a cleanup of the changes and retested on our app. All checked-out okay. |
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
Sorry, my previous comment was wrong. Synchronized is a recursive lock in JVM, so you can still have concurrent modification here. The right fix is to do the copy in a synchronized block though. |
This reverts commit 95feba8.
No problem, @javache, I reverted the latest commit. |
The copying of beforeUiblocks and clearing of it still needs to happen in a synchronized block. |
…n in a synchronized block
✔️ |
@javache has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
@javache thank you so much for helping me get through this PR and being so responsive. It was really unexpectedly wonderful. Having never tried to open a PR against such a big repo before, I didn't know how long this was going to take, so I had expected "awhile." Now that you've imported it into your own system, can you have this be a fix for not only the main line but also for v0.79.x? |
...ctAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
Outdated
Show resolved
Hide resolved
Ah, react-native-releases may become my eventual stop for a "Pick Request"? |
This pull request was successfully merged by @jkoutavas in 48b2dd3 When will my fix make it into a release? | How to file a pick request? |
Summary:
This React Native Android fix hardens the Fabric
InteropUiBlockListener
againstConcurrentModificationException
crashes inwillMountItems
anddidMountItems
. By iterating over a shallow copy of the UI‐block lists and catching any mid‐iteration mutations, we ensure the listener never throws during a UI frame and always clears its pending blocks.The issue was first reported in React Native Issue #49783, and although React Native PR#50091 was closed and not merged, the work in that PR did make it to React Native in commit 17da3cb. However, the fix didn't go far enough. We saw intermittent examples of this exception being thrown when swiping through a carousel from
react-native-reanimated-carousel
. This fix goes right to the exception site itself.Changelog:
[ANDROID] [FIXED] - Hardened the Fabric
InteropUiBlockListener
againstConcurrentModificationException
crashes inwillMountItems
anddidMountItems
Test Plan:
The only way to test this is to develop a standalone app that emulates what we've been seeing in our commercially available RN app. We have done extensive testing of before (intermittent crashes) and after the fix (no crashes) and things have been standing up very well for us.
Here is a the Red Box we see right at the time of the crash, before this fix:
And here is the beginning of the logcat crash log:
All of this goes away with this fix. We're using React Native 0.79.2 and this is the first time we've open a PR for react-native. I hope this is enough info as far as testing goes.
Can we see a 0.79.x release with this fix, please?