From 8bb78553a229a0a58bb41bafa62cdddfeb8bf5da Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Mon, 24 Feb 2020 13:52:09 -0800 Subject: [PATCH] Make DeviceInfoModule extend code-generated Java spec Summary: I think this NativeModule was converted before we checked in the Java codegen output for TurboModules. I'm making `DeviceInfoModule` extend `NativeDeviceInfoSpec` to properly make it a TurboModule. Changelog: [Internal] Reviewed By: PeteTheHeat Differential Revision: D19911145 fbshipit-source-id: fcec8c5b991bd9fd991e690dfa51f1bd36117e5f --- .../react/modules/deviceinfo/DeviceInfoModule.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java index 828f209cd76..74a97e0c7bf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java @@ -9,6 +9,7 @@ package com.facebook.react.modules.deviceinfo; import android.content.Context; import androidx.annotation.Nullable; +import com.facebook.fbreact.specs.NativeDeviceInfoSpec; import com.facebook.react.bridge.LifecycleEventListener; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; @@ -25,8 +26,8 @@ import java.util.Map; /** Module that exposes Android Constants to JS. */ @ReactModule(name = DeviceInfoModule.NAME) -public class DeviceInfoModule extends ReactContextBaseJavaModule - implements LifecycleEventListener, TurboModule { +public class DeviceInfoModule extends NativeDeviceInfoSpec + implements LifecycleEventListener { public static final String NAME = "DeviceInfo"; @@ -55,7 +56,7 @@ public class DeviceInfoModule extends ReactContextBaseJavaModule } @Override - public @Nullable Map getConstants() { + public @Nullable Map getTypedExportedConstants() { HashMap constants = new HashMap<>(); constants.put("Dimensions", DisplayMetricsHolder.getDisplayMetricsMap(mFontScale)); return constants;