Bug 1401737 - 5. Revert diagnostic crash; r=me
authorJim Chen <nchen@mozilla.com>
Tue, 10 Oct 2017 15:13:46 -0400
changeset 385363 ea3bce8585831403a2a9b4760cf5488b5c538143
parent 385362 3c5cbd09b60457cc82f3483d0c27978ac700ecc8
child 385364 be0cfcefed9773a94043e0970206f25d8579d672
push id95996
push usernchen@mozilla.com
push dateTue, 10 Oct 2017 19:14:37 +0000
treeherdermozilla-inbound@be0cfcefed97 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1401737
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1401737 - 5. Revert diagnostic crash; r=me MozReview-Commit-ID: 6wZvzHgUH7Z
mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -192,18 +192,16 @@ public class GeckoApplication extends Ap
             GeckoThread.onResume();
             mPausedGecko = false;
             GeckoNetworkManager.getInstance().start(this);
         }
 
         mInBackground = false;
     }
 
-    private static Application sApp;
-
     @Override
     public void onCreate() {
         Log.i(LOG_TAG, "zerdatime " + SystemClock.elapsedRealtime() +
               " - application start");
 
         final Context context = getApplicationContext();
         GeckoAppShell.ensureCrashHandling();
         GeckoAppShell.setApplicationContext(context);
@@ -274,25 +272,16 @@ public class GeckoApplication extends Ap
         // We need to set the notification client before launching Gecko, since Gecko could start
         // sending notifications immediately after startup, which we don't want to lose/crash on.
         GeckoAppShell.setNotificationListener(new NotificationClient(context));
         // This getInstance call will force initialization of the NotificationHelper, but does nothing with the result
         NotificationHelper.getInstance(context).init();
 
         MulticastDNSManager.getInstance(context).init();
 
-        if (sApp == null) {
-            sApp = this;
-        } else {
-            GeckoAppShell.appendAppNotesToCrashReport("Bug 1401737: " +
-                    this + '/' + getPackageName() + '/' + getApplicationInfo().uid + ' ' +
-                    sApp + '/' + sApp.getPackageName() + '/' + sApp.getApplicationInfo().uid);
-            throw new IllegalStateException("Bug 1401737 diagnostic crash 2");
-        }
-
         GeckoService.register();
 
         IntentHelper.init();
 
         final EventListener listener = new EventListener();
         EventDispatcher.getInstance().registerUiThreadListener(listener,
                 "Gecko:Exited",
                 "RuntimePermissions:Check",