From 6548ffc7319bb854d136b5b2c745eb32eeec8616 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Mon, 30 May 2022 02:31:43 -0700 Subject: [PATCH] Fix broken test_android on CircleCI Summary: This diff addresses a couple of failures introduced on D36608419 (https://github.com/facebook/react-native/commit/7b778fbebb9e11896f0ef1578645232bb9bf0c7f) Changelog: [Internal] [Fixed] - Fix broken test_android on CircleCI Reviewed By: robhogan Differential Revision: D36758484 fbshipit-source-id: 10601af3719e881a68c186ebcc75081692ae7e85 --- .../src/main/java/com/facebook/react/uimanager/ViewManager.java | 2 +- .../java/com/facebook/react/uimanager/ViewManagerRegistry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java index 854bacec83c39b..d0cae313b072c7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java @@ -55,7 +55,7 @@ protected void enableViewRecycling() { return null; } if (!mRecyclableViews.containsKey(surfaceId)) { - mRecyclableViews.put(surfaceId, new Stack<>()); + mRecyclableViews.put(surfaceId, new Stack()); } return mRecyclableViews.get(surfaceId); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java index fea9babb24087a..2fe412b4e437d7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java @@ -131,7 +131,7 @@ ViewManager getViewManagerIfExists(String className) { } /** Send lifecycle signal to all ViewManagers that StopSurface has been called. */ - public void onSurfaceStopped(int surfaceId) { + public void onSurfaceStopped(final int surfaceId) { Runnable runnable = new Runnable() { @Override