diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java index ab6d1739b05..92b4e414d22 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java @@ -104,8 +104,8 @@ public class DisplayMetricsHolder { } public static Map> getDisplayMetricsMap(double fontScale) { - Assertions.assertNotNull( - sWindowDisplayMetrics != null || sScreenDisplayMetrics != null, + Assertions.assertCondition( + sWindowDisplayMetrics != null && sScreenDisplayMetrics != null, "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics"); final Map> result = new HashMap<>(); result.put("windowPhysicalPixels", getPhysicalPixelsMap(sWindowDisplayMetrics, fontScale)); @@ -114,8 +114,8 @@ public class DisplayMetricsHolder { } public static WritableNativeMap getDisplayMetricsNativeMap(double fontScale) { - Assertions.assertNotNull( - sWindowDisplayMetrics != null || sScreenDisplayMetrics != null, + Assertions.assertCondition( + sWindowDisplayMetrics != null && sScreenDisplayMetrics != null, "DisplayMetricsHolder must be initialized with initDisplayMetricsIfNotInitialized or initDisplayMetrics"); final WritableNativeMap result = new WritableNativeMap(); result.putMap(