From ec4b85467db3a354e26f03d33ff0d703cf1b1585 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Fri, 31 Mar 2017 00:46:17 -0700
Subject: [PATCH] Allow DeviceInfoModule to be instantiated with only an
 android Context

Reviewed By: javache

Differential Revision: D4772673

fbshipit-source-id: 80894faa076ccfddf0fe28bd4d7b6aaeba6c38a5
---
 .../modules/deviceinfo/DeviceInfoModule.java  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 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 c7b53241452..e768259e34a 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
@@ -14,12 +14,13 @@ import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
+import android.content.Context;
 import android.util.DisplayMetrics;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -29,16 +30,21 @@ import com.facebook.react.uimanager.DisplayMetricsHolder;
  * Module that exposes Android Constants to JS.
  */
 @ReactModule(name = "DeviceInfo")
-public class DeviceInfoModule extends ReactContextBaseJavaModule implements
+public class DeviceInfoModule extends BaseJavaModule implements
     LifecycleEventListener {
 
+  private @Nullable ReactApplicationContext mReactApplicationContext;
   private float mFontScale;
 
-  public DeviceInfoModule(
-      ReactApplicationContext reactContext) {
-    super(reactContext);
+  public DeviceInfoModule(ReactApplicationContext reactContext) {
+    this((Context) reactContext);
+    mReactApplicationContext = reactContext;
+  }
 
-    mFontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+  public DeviceInfoModule(Context context) {
+    mReactApplicationContext = null;
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context);
+    mFontScale = context.getResources().getConfiguration().fontScale;
   }
 
   @Override
@@ -57,7 +63,11 @@ public class DeviceInfoModule extends ReactContextBaseJavaModule implements
 
   @Override
   public void onHostResume() {
-    float fontScale = getReactApplicationContext().getResources().getConfiguration().fontScale;
+    if (mReactApplicationContext == null) {
+      return;
+    }
+
+    float fontScale = mReactApplicationContext.getResources().getConfiguration().fontScale;
     if (mFontScale != fontScale) {
       mFontScale = fontScale;
       emitUpdateDimensionsEvent();
@@ -73,7 +83,11 @@ public class DeviceInfoModule extends ReactContextBaseJavaModule implements
   }
 
   public void emitUpdateDimensionsEvent() {
-    getReactApplicationContext()
+    if (mReactApplicationContext == null) {
+      return;
+    }
+
+    mReactApplicationContext
         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
         .emit("didUpdateDimensions", getDimensionsConstants());
   }