Backed out changeset ef83f24a68ac (bug 1505897) for mochitest crashes on test_mq_prefers_reduced_motion_dynamic.html. CLOSED TREE

mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java

@@ -284,8 +284,6 @@ public class GeckoThread extends Thread {
 
         final String resourcePath = context.getPackageResourcePath();
 
-        GeckoSystemStateListener.getInstance().initialize(context);
-
         try {
             loadGeckoLibs(context, resourcePath);
             return;

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java

@@ -232,6 +232,8 @@ public final class GeckoRuntime implements Parcelable {
 
         // Initialize the system ClipboardManager by accessing it on the main thread.
         GeckoAppShell.getApplicationContext().getSystemService(Context.CLIPBOARD_SERVICE);
+
+        GeckoSystemStateListener.getInstance().initialize(context);
         return true;
     }
 

widget/android/nsAppShell.cpp

@@ -412,7 +412,6 @@ nsAppShell::nsAppShell()
         if (jni::IsAvailable()) {
             GeckoThreadSupport::Init();
             GeckoAppShellSupport::Init();
-            mozilla::GeckoSystemStateListener::Init();
             mozilla::widget::Telemetry::Init();
 
             // Set the corresponding state in GeckoThread.