Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix react-native-oss-android tests

Browse Source 
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
This commit is contained in:
David Vacca
2021-03-15 16:21:10 -07:00
committed by Facebook GitHub Bot
parent 6333c15fa2
commit e3e7701c14
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/bridge/ActivityEventListener.java
+1 -2
View File
@@ -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);
ReactAndroid/src/main/java/com/facebook/react/bridge/BaseActivityEventListener.java
+1 -3
View File
@@ -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) {}
ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+1 -2
View File
@@ -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);