From e3e7701c141d6f21f31c81f2570171f19f1640cf Mon Sep 17 00:00:00 2001 From: David Vacca Date: Mon, 15 Mar 2021 16:18:34 -0700 Subject: [PATCH] Fix react-native-oss-android tests Summary: build-break overriding_review_checks_triggers_an_audit_and_retroactive_review Oncall Short Name: petetheheat This diff removes the Nullable annotation added by D27045861 (https://github.com/facebook/react-native/commit/903351f22ee8e0bced19257ddee7fdf8a7516278) The goal is to fix react-native-oss-android tests Changelog: [Android][Changed] - Remove Nullable annotation from ActivityEventListener.onActivityResult method Reviewed By: fkgozali Differential Revision: D27063989 fbshipit-source-id: fda81c36380e4ffdf9d3bf3ca5ff47f8ebb415cc --- .../java/com/facebook/react/bridge/ActivityEventListener.java | 3 +-- .../com/facebook/react/bridge/BaseActivityEventListener.java | 4 +--- .../src/main/java/com/facebook/react/bridge/ReactContext.java | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java index 5f409ed11b5..70301b75871 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java @@ -9,7 +9,6 @@ package com.facebook.react.bridge; import android.app.Activity; import android.content.Intent; -import javax.annotation.Nullable; /** * Listener for receiving activity events. Consider using {@link BaseActivityEventListener} if @@ -18,7 +17,7 @@ import javax.annotation.Nullable; public interface ActivityEventListener { /** Called when host (activity/service) receives an {@link Activity#onActivityResult} call. */ - void onActivityResult(Activity activity, int requestCode, int resultCode, @Nullable Intent data); + void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data); /** Called when a new intent is passed to the activity */ void onNewIntent(Intent intent); diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java index 3807cc04a8e..d3702ed33ea 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java @@ -9,7 +9,6 @@ package com.facebook.react.bridge; import android.app.Activity; import android.content.Intent; -import javax.annotation.Nullable; /** An empty implementation of {@link ActivityEventListener} */ public class BaseActivityEventListener implements ActivityEventListener { @@ -19,8 +18,7 @@ public class BaseActivityEventListener implements ActivityEventListener { public void onActivityResult(int requestCode, int resultCode, Intent data) {} @Override - public void onActivityResult( - Activity activity, int requestCode, int resultCode, @Nullable Intent data) {} + public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {} @Override public void onNewIntent(Intent intent) {} diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java index 4241d14bec9..28d024fd4b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -305,8 +305,7 @@ public class ReactContext extends ContextWrapper { } /** Should be called by the hosting Fragment in {@link Fragment#onActivityResult} */ - public void onActivityResult( - Activity activity, int requestCode, int resultCode, @Nullable Intent data) { + public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { for (ActivityEventListener listener : mActivityEventListeners) { try { listener.onActivityResult(activity, requestCode, resultCode, data);