Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/56100
## Changelog:
[iOS] [Fixed] - Revert RCTAnimatedModuleProvider change from D94244698
D94244698 added a guard in RCTAnimatedModuleProvider that returns nullptr
when useSharedAnimatedBackend() is true, expecting DefaultTurboModules to
handle AnimatedModule creation instead.
However, on iOS the TurboModule resolution chain in RCTReactNativeFactory
delegates to the app-provided getTurboModule:jsInvoker: and returns whatever
the delegate returns — even nullptr — without falling through to
DefaultTurboModules.
This causes `Invariant Violation: Native animated module is not available`
on any surface using Animated.View (e.g. Marketplace PDP) when
react_fabric.enable_shared_animated_backend_ios is enabled.
Revert the RCTAnimatedModuleProvider change from D94244698 so it always
provides AnimatedModule when cxxNativeAnimatedEnabled is true, regardless
of useSharedAnimatedBackend. The shared backend path in DefaultTurboModules
still exists as fallback for non-iOS platforms.
Reviewed By: christophpurrer
Differential Revision: D96611917
fbshipit-source-id: e01cf5c80dc4cbf30afac6bcf414616c15bfaddb
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/56005
Changelog: [Internal]
The build_debugger_shell CI job was failing because build-binary.js
expects pkg.main to start with ./dist/, but without --prepack the
prepack.js script never runs, so main stays as ./src/index.js.
This was caused by a series of PRs:
- PR #54857 refactored debugger-shell/package.json to use the
publishConfig pattern, moving main from ./dist/index.js to
./src/index.js.
- PR #55415 added the --prepack flag to build.js to support this.
- PR #55416 added the build_debugger_shell CI job but ran yarn build
without --prepack.
The fix passes --prepack to yarn build so that prepack.js rewrites
package.json main to ./dist/index.js before build-binary.js runs.
Reviewed By: huntie
Differential Revision: D95818417
fbshipit-source-id: 03c8340c415960c3937b13bdea3952798d2d420e
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55729
This is added so that one can easily enables c++ AnimatedModule in open source.
If an app doesn't use `RCTAnimatedModuleProvider`(ios) or `AnimatedCxxReactPackage`(android), it can fallback to this default AnimatedModule when it has both c++animated and shared backend enabled
- shared backend removes the need to pass down start/stop callbacks to NativeAnimatedNodesManagerProvider, so we can cleanly initialize it as static default
- RCTAnimatedModuleProvider uses the version of AnimatedModule that still relies on a dedicated CADisplayLink for start/stop
- AnimatedCxxReactPackage also bundles internal ViewEventModule (for NativeViewEvents) that shares `NativeAnimatedNodesManagerProvider` with AnimatedModule, but NativeViewEvents is not needed for open source
- Alternatively we could also expose `NativeAnimatedNodesManagerProvider` via UIManager so other turbomodules can also use it. However I don't think it makes sense to double down on another animation API on UIManager given we have shared backend.
- This assumes DefaultTurboModules is always the fallback module provider. So it'll not override when app already uses RCTAnimatedModuleProvider or AnimatedCxxReactPackage
[General] [Added] - Add c++ AnimatedModule to DefaultTurboModules
Reviewed By: NickGerleman
Differential Revision: D94244698
fbshipit-source-id: 09e905eb4bad7d03cdf87d5b47352060b0e6212f
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55613
The cloneMultiple method was written in a way to accept a list of families that are presumed to be owned by the api caller. This designe was mostly aimed at reanimated, that holds refernces to ShadowNodes (that own these families). In the case of AnimationBackend this didn't work properly, as when the view is unmounted we would lose the ShadowNodeFamily shared_ptr that we hold and it could get deallocated.
Since now we can get an owning reference to ShadowNodeFamily from ShadowNode::getFamilyShared, we don't have to keep this old unsafe api. Instead we require the caller to have an owning reference with the api itself.
This `cloneMultiple` method isn't really adopted in the community, so the breaking change shouldn't be a big problem.
Changelog:
[General][Breaking] - fix unsafe rawPointer access in cloneMultiple.
Reviewed By: zeyap, javache
Differential Revision: D93596770
fbshipit-source-id: c4d99b51875968ebce50358c19502cba02c50685
The build_android workflow was incorrectly using for dry-run
builds on stable branches (e.g., 0.85-stable), causing it to append suffix
to the Hermes version. This resulted in trying to fetch non-existent SNAPSHOT artifacts
like in https://github.com/facebook/react-native/actions/runs/22592250332/job/65471130298.
This fix adds a check to detect stable branches (via github.ref_name or github.base_ref)
and uses instead, which fetches the stable Hermes release from
Maven Central without the -SNAPSHOT suffix.
We check both github.ref_name and github.base_ref to cover two scenarios:
ref_name: Direct pushes to stable branches (e.g. pushing to 0.85-stable)
base_ref: Pull requests targeting stable branches (e.g. cherry-pick PRs where the source branch isn't named -stable but the target isChangelog: [Internal]
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55825
changelog: [internal]
Hoist regex patterns to module-level constants to avoid recompiling them on every function call. This optimization targets a hotspot identified via JS sampling profiler.
Benchmark results show 6-7% improvement in "views with large props and styles" tests:
- render 100 views with large props/styles: 9.48ms → 8.89ms (-6.2%)
- render 1500 views with large props/styles: 137.2ms → 127.5ms (-7.0%)
Reviewed By: javache, NickGerleman
Differential Revision: D92153667
fbshipit-source-id: d4cd98d34e968b2cea5a491ede4ed727273708cd
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55850
D91320248 removed `receiveTouches` from the `RCTEventEmitter` interface entirely.
This was too big of a breaking change — ecosystem libraries that implement
`RCTEventEmitter` or `RCTModernEventEmitter` and override `receiveTouches` would
fail to compile.
This brings back `receiveTouches` on `RCTEventEmitter` but with a default no-op
implementation, so existing implementers that override it continue to compile, and
new implementers don't need to provide one.
Changelog: [Android][Changed] Re-added `receiveTouches` to `RCTEventEmitter` with a default no-op implementation to avoid breaking ecosystem libraries
Reviewed By: cortinico
Differential Revision: D94903267
fbshipit-source-id: fd89da9714b02a72c6ff271375307f620f5d2e3d
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55806
After https://github.com/facebook/react-native/pull/55805, the RN Babel preset no longer reads `process.env.BABEL_ENV` directly, instead using Babel's `env()` API, which is both cache-aware and properly respects explicit `envName` config.
See:
- https://babeljs.io/docs/config-files#apienv
- https://babeljs.io/docs/options#envname
Now, instead of mutating `process.env.BABEL_ENV` to force the environment for a transform (and having to worry about restoring it to avoid side-effects), we can just specify `envName` instead.
Changelog: [Internal]
Reviewed By: javache
Differential Revision: D94662935
fbshipit-source-id: 598a8dd53e33e4b5edfe62778a61c6bf3c48a4e7
Summary:
When a PR targets a `-stable` branch, `github.ref_name` is the PR branch (not ending in `-stable`), so the version script was incorrectly running. Added a check for `github.base_ref` to also skip the script when the PR target branch is a stable branch.
## Changelog:
[Internal] - Skip set-rn-artifacts-version for PRs targeting stable branches
Pull Request resolved: https://github.com/facebook/react-native/pull/55809
Test Plan: CI should pass without running the artifacts version script on PRs targeting stable branches.
Reviewed By: cortinico
Differential Revision: D94678295
Pulled By: cipolleschi
fbshipit-source-id: 5809ec710c191075f1bc1528ecff95f8bd745257
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55794
Format the error messages coming from bundling to mainting the formatting and make these easier to read.
Changelog: [Internal]
Reviewed By: javache
Differential Revision: D94611951
fbshipit-source-id: cbb8b2d1ff517b5487d4b799b1e2e3476629f84c
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55818
This unblocks the Android CI on master
The deprecated getUIImplementation() method was returning null, which could
cause NullPointerExceptions for callers that still depend on it. Return a
new UIImplementation instance instead.
Changelog: [Internal] - Fix `UIManagerModule.getUIImplementation()` to return a non-null `UIImplementation` instead of null
Reviewed By: alanleedev
Differential Revision: D94743629
fbshipit-source-id: df129f87c310a68634678ff7ed90e77275b02b51
Summary:
Pull request resolved: https://github.com/facebook/react-native/pull/55805
Currently the RN Babel preset has this surprising bit of behaviour:
```js
module.exports = (options, babel) => {
if (options.withDevTools == null) {
const env = process.env.BABEL_ENV || process.env.NODE_ENV;
if (!env || env === 'development') {
return getPreset(null, {...options, dev: true}, babel);
}
}
return getPreset(null, options, babel);
};
```
If the (undocumented, otherwise unused) `withDevTools` option is set (to anything), we will override any given value of `dev` to `true` if `BABEL_ENV` || `NODE_ENV || 'development' === 'development'`.
To put that another way, with `NODE_ENV=development` and `BABEL_ENV` unset, we would always produce a dev bundle even if `{ dev: false }`
Expo sets `withDevTools: false` to stop this happening, and always set `dev` (so this diff means **no observable change under Expo**):
https://github.com/expo/expo/blob/4a46dbff7a5a77d9fe06d30a70d7fab38cfc7f9a/packages/babel-preset-expo/build/index.js#L235-L236
This odd-looking override was introduced in 2017 in https://github.com/facebook/react-native/commit/bc22a4da7ea74d17cd701717268c8e50f001d614 / D5237158 as a way to gate `babel/plugin-transform-react-jsx-source`, *before the preset accepted any other options* - it was never intended to override `dev`. Now, we gate that same plugin under `options.dev`.
## Inferring `dev` when unspecified
The one potentially load-bearing piece of this is that, when a consumer specifies neither `withDevTools` nor `dev` (or maybe no options at all), this code serves to infer it from `process.env.BABEL_ENV || process.env.NODE_ENV`, which is reasonable and actually closer to the way typical plugins/presets work, but a better mechanism compatible with Babel's cache is to use the `env()` API (which defaults to `process.env.BABEL_ENV || process.env.NODE_ENV`, so preserves behaviour).
https://babeljs.io/docs/config-files#apienv
## This change
- Removes the obsolete use of `withDevToolss`, and never overrides the explicitly-passed `dev`
- Where `dev` is not specified, falls back to the Babel environment.
Changelog:
[General][Fixed] Babel-preset: Don't override explicitly-passed `dev` config if obsolete `withDevTools` is missing
Reviewed By: huntie
Differential Revision: D94660480
fbshipit-source-id: 5dfae8fb704e6881b03120cd14510795382a98ba
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55810
`DisplayMetricsHolder.initDisplayMetrics()` calls `context.getSystemService(WINDOW_SERVICE)` which throws `IllegalAccessException` on Android 11+ (API 30+) when called from a non-visual context (e.g. Application context). Multiple callers pass non-Activity contexts (ReactHostImpl, UIManagerModule, DeviceInfoModule, ReactInstance, ReactInstanceManager).
This adds a try-catch around the WindowManager access as defense-in-depth. When it fails, `screenDisplayMetrics` retains the values already copied from resource display metrics via `setTo()`, which is a graceful degradation (only missing system decor dimensions like nav bar height).
Changelog: [Internal] - Guard WindowManager access in DisplayMetricsHolder against non-visual contexts on API 30+
Reviewed By: javache, mdvacca
Differential Revision: D94283765
fbshipit-source-id: 51c3ead60784d30d74fcb9111924aed3ca8483ec
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55789
Removes the deprecated `CatalystInstanceImpl` class (Java) and its C++ JNI
counterparts (`CatalystInstanceImpl.h` and `CatalystInstanceImpl.cpp`) as part
of the Legacy Architecture cleanup.
`CatalystInstanceImpl` was the bridge implementation for the old architecture.
Its sole consumer, `ReactInstanceManager`, is itself deprecated — its
constructor already throws `UnsupportedOperationException`. The
`createReactContext` method that instantiated `CatalystInstanceImpl` has been
stubbed to throw `UnsupportedOperationException` as well.
Changes:
- Deleted `CatalystInstanceImpl.java` (621 lines)
- Deleted `CatalystInstanceImpl.h` and `CatalystInstanceImpl.cpp` (523 lines)
- Stubbed `ReactInstanceManager.createReactContext` to throw
- Removed from BUCK and CMakeLists.txt build files
- Removed from ReactAndroid.api public API surface
- Removed from ReactNoNewJavaDetector Java allowlist
- Removed from legacy architecture tracking script
- Added direct `#include <cxxreact/MessageQueueThread.h>` to
`JavaModuleWrapper.cpp` to replace transitive dependency
Changelog: [Android][Removed] - Remove deprecated CatalystInstanceImpl
Reviewed By: javache
Differential Revision: D94548637
fbshipit-source-id: 5c447b85c80605cff17c1555d62ede5e9e2f18a7
Summary:
This PR fixes an Android Native Animated crash in tracking + spring animations when the tracked `toValue` node is detached.
In `TrackingAnimatedNode.update`, if the tracked node could not be resolved, we used to write `toValue = null` into `animationConfig`. `SpringAnimation.resetConfig` expects `toValue` to be a number, so this could crash with `NullPointerException: null cannot be cast to non-null type kotlin.Number`
This can happen in real apps during graph teardown (for example unmount/re-render/navigation transitions), where tracking may still update for a transient frame after the tracked node has been detached.
Fix:
- Do not propagate null `toValue` from `TrackingAnimatedNode`.
- If the tracked node is missing, fallback to the driven value node’s current value.
- If both nodes are unavailable, return safely.
This PR also adds a regression test.
## Changelog:
[ANDROID] [FIXED] - Prevent Native Animated tracking spring crash when tracked `toValue` node is detached.
Pull Request resolved: https://github.com/facebook/react-native/pull/55734
Test Plan:
Added regression test `NativeAnimatedNodeTraversalTest.testTrackingSpringDoesNotCrashWhenToValueNodeIsDetached`
- On a test-only commit (without the fix), the new test fails with: `NullPointerException: null cannot be cast to non-null type kotlin.Number`
- On this PR (with the fix), test pass.
Reviewed By: christophpurrer
Differential Revision: D94697059
Pulled By: zeyap
fbshipit-source-id: c8f1f619c34ce7887d6f9bfb42a035d41d6a063a
Summary:
Fixes https://github.com/facebook/react-native/issues/55768
When a `ScrollView` is recycled in RTL mode, resetting `_scrollView.zoomScale = 1.0` inside `prepareForRecycle` causes UIKit to mutate `_containerView.frame`, pushing the content off-screen.
Because the old `_contentSize` still matches the new `contentSize`, `updateState:` hits an early return optimization and fails to correct the mutated frame.
This PR invalidates the cached `_contentSize` by setting it to `CGSizeZero` immediately after the `zoomScale` reset. This bypasses the early return and forces a correct recalculation of the frame.
*Credit: Full credit to kligarski for debugging and pinpointing the exact mechanism in the original issue.*
## Changelog:
[IOS] [FIXED] - Fixed RTL ScrollView offset bug upon recycling in Fabric
Pull Request resolved: https://github.com/facebook/react-native/pull/55804
Test Plan:
1. Ran the reproducer app provided in issue https://github.com/facebook/react-native/issues/55768.
2. Verified that navigating (Push/Pop) multiple times with a `ScrollView` in an RTL layout no longer causes the content to offset to the left of the window. The ScrollView remains correctly positioned.
Reviewed By: cipolleschi
Differential Revision: D94682107
Pulled By: javache
fbshipit-source-id: 3603824dcf37858f2924c9414a0ad4fcca2aea68
Summary:
`DynamicFromArray` uses a plain `Pools.SimplePool` shared across all threads. When two threads concurrently access the same pooled `DynamicFromArray` instance — one calling `recycle()` while the other reads from it — the reader sees `array == null` and throws `IllegalStateException("This dynamic value has been recycled")`.
The sibling class `DynamicFromMap` was fixed for this exact issue in https://github.com/facebook/react-native/issues/17842 (2018) by switching to `ThreadLocal<SimplePool>`, giving each thread its own isolated pool. A reviewer on that PR [noted](https://github.com/facebook/react-native/pull/17842#issuecomment-426784854) the same fix should be applied to `DynamicFromArray`, but it never was.
This PR applies the identical `ThreadLocal` pattern from `DynamicFromMap` to `DynamicFromArray`.
## Changelog:
[ANDROID] [FIXED] - Fix thread-safety crash in `DynamicFromArray` by using `ThreadLocal<SimplePool>` instead of a shared `SimplePool`, matching the existing fix in `DynamicFromMap`
Pull Request resolved: https://github.com/facebook/react-native/pull/55793
Test Plan:
The change mirrors the existing pattern in `DynamicFromMap.kt` in the same directory — the only difference is the type parameter. The crash is a race condition that is not reliably reproducible in a unit test, but can be confirmed by:
1. Verify `DynamicFromArray.kt` now uses `ThreadLocal<Pools.SimplePool<DynamicFromArray>>` for its pool, `pool.get()?.acquire()` in `create()`, and `pool.get()?.release(this)` in `recycle()`
2. Verify this matches the pattern in `DynamicFromMap.kt` line-for-line
3. Build and run the Android app — no behavioral change expected since the pooling logic is identical, just thread-isolated
Reviewed By: cortinico
Differential Revision: D94676330
Pulled By: javache
fbshipit-source-id: 6ba0be783dc44c913bf57040d57fd98e184636ba
Summary:
`ReactFontManager` has a write-only API for custom fonts — you can register fonts but there's no way to query what's been registered. This asymmetry means a library that needs to know about font availability needs to use reflection on the private `customTypefaceCache` map, or maintain a custom registry that can easily go out of sync.
This becomes a problem when multiple libraries need to cooperate around fonts. Today when a library registers a font, there's no clean way for another library to discover what the first one registered.
This adds a `customFontFamilies` property that returns the set of font family names currently in the custom typeface cache.
Only `customTypefaceCache` is exposed in this PR because it contains fonts explicitly registered by library code via `addCustomFont()`, whereas `fontCache` is lazily populated as a side effect of `getTypeface()` calls and its contents depend on what has been requested so far rather than what is available.
Asset-based fonts (in `assets/fonts/`) already have a discoverable source of truth - the filesystem.
## Changelog:
[ANDROID] [ADDED] - `ReactFontManager.customFontFamilies` property to query registered custom font family names
Pull Request resolved: https://github.com/facebook/react-native/pull/55711
Test Plan:
- tested ok by adding
```kt
val customFonts = ReactFontManager.getInstance().customFontFamilies
Log.d("RNTesterApplication", "customFontFamilies: $customFonts")
```
prints: `customFontFamilies: [Rubik, FiraCode]`
[here](https://github.com/facebook/react-native/blob/9353eb55b877e6e51c35c6041eebd72971c6b9a5/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.kt#L123)
Reviewed By: cortinico
Differential Revision: D94665574
Pulled By: javache
fbshipit-source-id: 07d802ac98f4a738858038a2af6ce8d85c28b5ce
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55762
On API <= 28, `clipWithAntiAliasing` uses `saveLayer` for anti-aliased border radius clipping. When a view is partially off-screen, the GPU only renders into the visible portion of the `saveLayer` buffer, leaving off-screen pixels as opaque black. These black pixels survive Porter-Duff compositing and appear as visible artifacts.
Adding `canvas.clipRect(0, 0, view.width, view.height)` before `saveLayer` forces HWUI to properly initialize the offscreen buffer relative to the GPU scissor. The clip is in local coordinates, so it stays correct across parent transform animations and scrolling offsets.
Changelog: [Internal]
Reviewed By: NickGerleman, jorge-cab
Differential Revision: D94447724
fbshipit-source-id: cb8470a00ca489a79779fe9b8e4f200c39f83284
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55802
Remove legacy Paper event emitters and deprecated methods (`receiveTouches`). InteropEvent still functions as before otherwise, and I've kept the `event.dispatch` API (although I believe events without a surface ID are dropped later in the pipeline?)
Changelog: [Android][Removed] Removed Paper-specific event dispatching methods.
Reviewed By: cortinico
Differential Revision: D91320248
fbshipit-source-id: a3228593c72a4286f7aac781d446fc3b0b1bd4ff
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55799
Changelog: [internal]
This adds Fantom tests for 2 recent changes in event dispatching in the React renderer:
- Verifies that event objects are exposed in the global scope during event dispatch.
- Verifies that event timestamps are read from native and use performance.now as fallback.
Reviewed By: huntie
Differential Revision: D85143175
fbshipit-source-id: 6fcc133239e0e510bbdec0b709e30ec7a350a85b
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55800
No need for a separate enum here when we can just use the std::variant itself.
Changelog: [Internal] Changed layout of GradientDirection
Reviewed By: sammy-SC
Differential Revision: D94522238
fbshipit-source-id: 7f02db573de4bf49e912795726adb302e91de969
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55783
Changelog: [Internal]
remove unnecessary const from ShadowNodeFamily. This allows us to get rid of a few mutable keywords.
Reviewed By: christophpurrer
Differential Revision: D90763777
fbshipit-source-id: 036c87ad504331507acb86b8e556d884c0a5d815
Summary:
This PR adds the missing test coverage for the standalone Fusebox debugger shell in `StandaloneFuseboxShell-test`.
First, I added some missing expectation for the success case (`enableStandaloneFuseboxShell=true` and no errors) already present:
- the assertion that `unstable_prepareFuseboxShell` is called just one time during middleware initialization
- the assertion that `launchDebuggerAppWindow` is never called when the standalone shell is available
Then, I added the missing test for the case when `unstable_prepareFuseboxShell` returns one of the error code like eg. `platform_not_supported` (as reported also in the TODO that I removed).
In this way now the test is verifying the full behaviour for the new standalone mode for debugger/dev tools.
## Changelog:
[GENERAL] [CHANGED] - Added missing tests for Standalone fusebox shell
Pull Request resolved: https://github.com/facebook/react-native/pull/55460
Test Plan:
- Ran `StandaloneFuseboxShell-test` and verify all tests cases passed
- Ran the full React Native test suite to ensure all tests pass.
- Verified test correctness by intentionally breaking production code:
- removing the calls to the `DefaultBrowserLauncher` in `openDebuggerMiddleware` to verify that the tests were correctly failing
Reviewed By: Abbondanzo
Differential Revision: D93157076
Pulled By: huntie
fbshipit-source-id: 51c12ad67dd929035f779b53add9163a6619cf41
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55790
React Native hardcodes http:// and ws:// schemes for all dev-support
URLs (inspector, message, status, bundle, debugger). When routing
through the proxy on port 443, this causes plain HTTP connections
to an HTTPS port, which fail.
Add httpScheme()/wsScheme() helpers to DevSupportHttpClient that
return https/wss when the host ends with :443, and update all URL
construction sites: DevServerHelper, JSPackagerClient, and
PackagerStatusCheck.
Changelog: [Internal]
Reviewed By: mdvacca, cipolleschi, vzaidman
Differential Revision: D94529835
fbshipit-source-id: f446939a82069c0466e26f107294ec4c6dd797d9
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/55456
**Context**
Follow-up to D89373824, which addressed a runtime Android crash with `FormData` uploads (https://github.com/facebook/react-native/issues/54881) but introduced a "[Preview unavailable]" fallback for the `ProgressRequestBody` case.
**This diff**
Reintroduce request body previews under this case.
Protects agains the original crash by:
- Checking `body.isOneShot()` to prevent disallowed double-reads of stream bodies.
- [Pre-existing] Preserves `BuildConfig.DEBUG` guard added in D89377163.
Changelog:
[Android][Added] - React Native DevTools: Restore request payload previews on Android
Reviewed By: vzaidman
Differential Revision: D89381124
fbshipit-source-id: ae6ce006285b4bcd7bbb09bb4413d119f18a8630