[Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog

content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

Index: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
index 4f2ec26d024690ef53362752c54f83a76aa6564a..0bdca83e1868f3b299c2b0134784413c4e284256 100644
--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
@@ -6,6 +6,7 @@ package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Handler;
+import android.os.StrictMode;
 
 import org.chromium.base.Log;
 import org.chromium.base.ResourceExtractor;
@@ -292,9 +293,19 @@ public class BrowserStartupController {
         ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
         resourceExtractor.startExtractingResources();
 
-        // Normally Main.java will have already loaded the library asynchronously, we only need
-        // to load it here if we arrived via another flow, e.g. bookmark access & sync setup.
-        LibraryLoader.get(mLibraryProcessType).ensureInitialized(mContext);
+        // This strictmode exception is to cover the case where the browser process is being started
+        // asynchronously but not in the main browser flow.  The main browser flow will trigger
+        // library loading earlier and this will be a no-op, but in the other cases this will need
+        // to block on loading libraries.
+        // This applies to tests and ManageSpaceActivity, which can be launched from Settings.
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+        try {
+            // Normally Main.java will have already loaded the library asynchronously, we only need
+            // to load it here if we arrived via another flow, e.g. bookmark access & sync setup.
+            LibraryLoader.get(mLibraryProcessType).ensureInitialized(mContext);
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
+        }
 
         Runnable postResourceExtraction = new Runnable() {
             @Override