From 7e44d2cca45b06392a87090faf4ec02b2c3c0963 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Tue, 1 Aug 2023 08:55:40 -0700 Subject: [PATCH] Reduce visibility of ReactHost.stopSurface to package only (#38695) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38695 Reduce visibility of ReactHost.stopSurface to package only changelog: [internal] internal Reviewed By: christophpurrer Differential Revision: D47915446 fbshipit-source-id: 570c4d195b6f7a028aad8707a4149a94d8e9ca1d --- .../com/facebook/react/bridgeless/ReactHost.java | 14 ++++++++------ .../facebook/react/bridgeless/ReactSurface.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java index 1093a98ce42..54463778e1a 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactHost.java @@ -239,17 +239,19 @@ public class ReactHost implements ReactHostInterface { * @param surface The surface to stop * @return A Task that will complete when stopSurface has been called. */ - public Task stopSurface(final ReactSurface surface) { + /** package */ + TaskInterface stopSurface(final ReactSurface surface) { final String method = "stopSurface(surfaceId = " + surface.getSurfaceID() + ")"; log(method, "Schedule"); detachSurface(surface); return callWithExistingReactInstance( - method, - reactInstance -> { - log(method, "Execute"); - reactInstance.stopSurface(surface); - }); + method, + reactInstance -> { + log(method, "Execute"); + reactInstance.stopSurface(surface); + }) + .makeVoid(); } /** diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java index d561baaa399..74cdf501a90 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridgeless/ReactSurface.java @@ -174,7 +174,7 @@ public class ReactSurface implements ReactSurfaceInterface { new IllegalStateException( "Trying to call ReactSurface.stop(), but no ReactHost is attached.")); } - return host.stopSurface(this).makeVoid(); + return host.stopSurface(this); } public int getSurfaceID() {