From dd4298a3770eee7f66846ef0cc4c41a628b7bf01 Mon Sep 17 00:00:00 2001
From: Jason Safaiyeh <safaiyeh@protonmail.com>
Date: Mon, 26 Oct 2020 18:47:03 -0700
Subject: [PATCH] Remove left over code from deprecating Android < 21 (#30243)

Summary:
Came to learn RN is deprecating Android 19, 20: https://github.com/facebook/react-native/commit/a17ff44adcf003dd4e4ef2301e1f80b77913f712

Did a quick check of left over code from the deprecation.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Deprecated] - Cleanup usages of deprecated Android API

Pull Request resolved: https://github.com/facebook/react-native/pull/30243

Reviewed By: fkgozali

Differential Revision: D24548084

Pulled By: JoshuaGross

fbshipit-source-id: 3054ca1455bcff2bd5c9791633942dc0cca7cb2c
---
 .../bridge/queue/ReactQueueConfigurationSpec.java   |  8 +-------
 .../datepicker/DismissableDatePickerDialog.java     | 13 -------------
 .../modules/network/ForwardingCookieHandler.java    |  2 +-
 .../react/views/view/ReactDrawableHelper.java       |  6 +-----
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
index dd31f88fd5fa16..2e0621497d19db 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/ReactQueueConfigurationSpec.java
@@ -19,8 +19,6 @@
  */
 public class ReactQueueConfigurationSpec {
 
-  private static final long LEGACY_STACK_SIZE_BYTES = 2000000;
-
   private final MessageQueueThreadSpec mNativeModulesQueueThreadSpec;
   private final MessageQueueThreadSpec mJSQueueThreadSpec;
 
@@ -44,11 +42,7 @@ public static Builder builder() {
   }
 
   public static ReactQueueConfigurationSpec createDefault() {
-    MessageQueueThreadSpec spec =
-        Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP
-            ? MessageQueueThreadSpec.newBackgroundThreadSpec(
-                "native_modules", LEGACY_STACK_SIZE_BYTES)
-            : MessageQueueThreadSpec.newBackgroundThreadSpec("native_modules");
+    MessageQueueThreadSpec spec = MessageQueueThreadSpec.newBackgroundThreadSpec("native_modules");
     return builder()
         .setJSQueueThreadSpec(MessageQueueThreadSpec.newBackgroundThreadSpec("js"))
         .setNativeModulesQueueThreadSpec(spec)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
index fc5cf31aeef772..cfcc1fd3c77488 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/DismissableDatePickerDialog.java
@@ -17,12 +17,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-/**
- * Certain versions of Android (Jellybean-KitKat) have a bug where when dismissed, the {@link
- * DatePickerDialog} still calls the OnDateSetListener. This class works around that issue.
- *
- * <p>See: <a href="https://code.google.com/p/android/issues/detail?id=34833">Issue 34833</a>
- */
 public class DismissableDatePickerDialog extends DatePickerDialog {
 
   public DismissableDatePickerDialog(
@@ -46,13 +40,6 @@ public DismissableDatePickerDialog(
     fixSpinner(context, year, monthOfYear, dayOfMonth);
   }
 
-  @Override
-  protected void onStop() {
-    // do *not* call super.onStop() on KitKat on lower, as that would erroneously call the
-    // OnDateSetListener when the dialog is dismissed, or call it twice when "OK" is pressed.
-    super.onStop();
-  }
-
   private void fixSpinner(Context context, int year, int month, int dayOfMonth) {
     if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N) {
       try {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
index 1fc82bd357d7a9..fe3f8c8506f68b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/ForwardingCookieHandler.java
@@ -126,7 +126,7 @@ protected void doInBackgroundGuarded(Void... params) {
   }
 
   /**
-   * Instantiating CookieManager in KitKat+ will load the Chromium task taking a 100ish ms so we do
+   * Instantiating CookieManager will load the Chromium task taking a 100ish ms so we do
    * it lazily to make sure it's done on a background thread as needed.
    */
   private @Nullable CookieManager getCookieManager() {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
index 4fb23c95a960f2..5d59a2466381a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
@@ -73,11 +73,7 @@ private static Drawable getDefaultThemeDrawable(Context context) {
   }
 
   private static RippleDrawable getRippleDrawable(
-      Context context, ReadableMap drawableDescriptionDict) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      throw new JSApplicationIllegalArgumentException(
-          "Ripple drawable is not available on android API <21");
-    }
+    Context context, ReadableMap drawableDescriptionDict) {
     int color = getColor(context, drawableDescriptionDict);
     Drawable mask = getMask(drawableDescriptionDict);
     ColorStateList colorStateList =