Handle getApplicationContext==null gracefully during init

Differential Revision: D49024899 fbshipit-source-id: dddc1b1303585e3674f648cb588d8c8207589a16
facebook · Sep 7, 2023 · c297ac5 · c297ac5
1 parent 1a4eb7e
commit c297ac5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/java/com/facebook/soloader/SoLoader.java b/java/com/facebook/soloader/SoLoader.java
@@ -264,7 +264,7 @@ public static void init(
     try {
       isEnabled = initEnableConfig(context);
       if (isEnabled) {
-        sAppType = getAppType(context, flags);
+        sAppType = getAppType(context);
         if ((flags & SOLOADER_EXPLICITLY_ENABLE_BACKUP_SOSOURCE) == 0
             && SysUtil.isSupportedDirectLoad(context, sAppType)) {
           // SoLoader doesn't need backup soSource if it supports directly loading .so file from APK
@@ -569,11 +569,12 @@ private static synchronized void initSoLoader(
     sSoFileLoader = new SoFileLoaderImpl();
   }
 
-  private static int getAppType(Context context, int flags) {
+  private static int getAppType(Context context) {
     if (sAppType != AppType.UNSET) {
       return sAppType;
     }
     if (context == null) {
+      LogUtil.d(TAG, "context is null, fallback to THIRD_PARTY_APP appType");
       return AppType.THIRD_PARTY_APP;
     }
 

diff --git a/java/com/facebook/soloader/SysUtil.java b/java/com/facebook/soloader/SysUtil.java
@@ -246,18 +246,22 @@ public static boolean is64Bit() {
       return android.os.Process.is64Bit();
     }
 
-    public static boolean isSupportedDirectLoad(Context context, int appType) throws IOException {
+    public static boolean isSupportedDirectLoad(@Nullable Context context, int appType)
+        throws IOException {
       if (appType == SoLoader.AppType.SYSTEM_APP) {
-        // Ideally, system_app permanently stores dso files uncompressed and page-aligned, even with
-        // FLAG_EXTRACT_NATIVE_LIBS flag. But to support a specific Oculus's sideload method, we
-        // need this extra checking. ref: D27831042
-        return isApkUncompressedDso(context);
+        if (context != null && context.getApplicationContext() != null) {
+          // Ideally, system_app permanently stores dso files uncompressed and page-aligned, even
+          // with FLAG_EXTRACT_NATIVE_LIBS flag. But to support a specific Oculus's sideload method,
+          // we need this extra checking. ref: D27831042
+          return isApkUncompressedDso(context);
+        }
+        return true;
       } else {
         return isDisabledExtractNativeLibs(context);
       }
     }
 
-    public static boolean isDisabledExtractNativeLibs(Context context) {
+    public static boolean isDisabledExtractNativeLibs(@Nullable Context context) {
       return context != null
           && (context.getApplicationInfo().flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) == 0;
     }
@@ -412,7 +416,8 @@ public static boolean is64Bit() {
     return is64bit;
   }
 
-  public static boolean isSupportedDirectLoad(Context context, int appType) throws IOException {
+  public static boolean isSupportedDirectLoad(@Nullable Context context, int appType)
+      throws IOException {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       // Android starts to support directly loading from API 23.
       // https://android.googlesource.com/platform/bionic/+/master/android-changes-for-ndk-developers.md#opening-shared-libraries-directly-from-an-apk