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 dd31f88fd5f..2e0621497d1 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 @@ import com.facebook.infer.annotation.Assertions; */ 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 class ReactQueueConfigurationSpec { } 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 fc5cf31aeef..cfcc1fd3c77 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 androidx.annotation.Nullable; 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. - * - *
See: Issue 34833 - */ public class DismissableDatePickerDialog extends DatePickerDialog { public DismissableDatePickerDialog( @@ -46,13 +40,6 @@ public class DismissableDatePickerDialog extends DatePickerDialog { 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 1fc82bd357d..fe3f8c8506f 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 @@ public class ForwardingCookieHandler extends CookieHandler { } /** - * 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 4fb23c95a96..5d59a246638 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 @@ public class ReactDrawableHelper { } 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 =