From 0c361d8f74a1a206bb3ea512def5eef9c424b417 Mon Sep 17 00:00:00 2001
From: Krzysztof Ciombor <krzysztof.ciombor@swmansion.com>
Date: Fri, 8 Dec 2017 12:45:06 +0100
Subject: [PATCH] Fix post-rebase issues

---
 Libraries/Components/Button.js                            | 8 --------
 .../java/com/facebook/react/ReactActivityDelegate.java    | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js
index 2f291f6934adc9..ff2e9f13838543 100644
--- a/Libraries/Components/Button.js
+++ b/Libraries/Components/Button.js
@@ -90,12 +90,6 @@ class Button extends React.Component<{
      * Used to locate this view in end-to-end tests.
      */
     testID: PropTypes.string,
-    /**
-     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
-     *
-     * @platform ios
-     */
-    hasTVPreferredFocus: PropTypes.bool,
   };
 
   render() {
@@ -106,7 +100,6 @@ class Button extends React.Component<{
       title,
       hasTVPreferredFocus,
       disabled,
-      hasTVPreferredFocus,
       testID,
     } = this.props;
     const buttonStyles = [styles.button];
@@ -138,7 +131,6 @@ class Button extends React.Component<{
         hasTVPreferredFocus={hasTVPreferredFocus}
         testID={testID}
         disabled={disabled}
-        hasTVPreferredFocus={hasTVPreferredFocus}
         onPress={onPress}>
         <View style={buttonStyles}>
           <Text style={textStyles} disabled={disabled}>{formattedTitle}</Text>
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
index 89b16ed460d095..de295799bd9fc7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java
@@ -79,11 +79,6 @@ protected void onCreate(Bundle savedInstanceState) {
     mDoubleTapReloadRecognizer = new DoubleTapReloadRecognizer();
   }
 
-  private boolean canHandleIntent(Intent intent) {
-    PackageManager packageManager = getContext().getPackageManager();
-    return intent.resolveActivity(packageManager) != null;
-  }
-
   protected void loadApp(String appKey) {
     if (mReactRootView != null) {
       throw new IllegalStateException("Cannot loadApp while app is already running.");