From a831b7db5643a9ae7a1ce2851330ce94075093ad Mon Sep 17 00:00:00 2001 From: Marian-Vasile Laza Date: Sat, 14 Aug 2021 00:44:48 +0300 Subject: [PATCH] Backed out changeset 65f8b0434e1e (bug 1708580) for causing Btime failures. CLOSED TREE --- .../src/main/java/org/mozilla/gecko/GeckoThread.java | 5 ----- toolkit/crashreporter/CrashAnnotations.yaml | 5 ----- widget/android/nsAppShell.cpp | 11 ----------- 3 files changed, 21 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java index 640bbc87a768..4c406fb9944e 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java @@ -587,11 +587,6 @@ public class GeckoThread extends Thread { return isStateAtLeast(minState) && isStateAtMost(maxState); } - @WrapForJNI(calledFrom = "gecko") - private static int getStateOrdinal() { - return ((State)sNativeQueue.getState()).ordinal(); - } - @WrapForJNI(calledFrom = "gecko") private static void setState(final State newState) { checkAndSetState(null, newState); diff --git a/toolkit/crashreporter/CrashAnnotations.yaml b/toolkit/crashreporter/CrashAnnotations.yaml index a65cf60a0ab3..85cbb532cbdd 100644 --- a/toolkit/crashreporter/CrashAnnotations.yaml +++ b/toolkit/crashreporter/CrashAnnotations.yaml @@ -298,11 +298,6 @@ ExperimentalFeatures: type: string ping: true -GeckoViewThreadState: - description: > - The zero-based ordinal of the GeckoThread.State at the time of the crash. - type: integer - GetHGlobalFromStreamFailure: description: > Error returned when invoking GetHGlobalFromStreamFailure() during the diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index 825c933de6bc..db8cccdaf9ab 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -541,17 +541,6 @@ nsAppShell::Observe(nsISupports* aSubject, const char* aTopic, } } else if (!strcmp(aTopic, "quit-application")) { if (jni::IsAvailable()) { -#if defined(EARLY_BETA_OR_EARLIER) - const int curGeckoThreadState = java::GeckoThread::GetStateOrdinal(); - CrashReporter::AnnotateCrashReport( - CrashReporter::Annotation::GeckoViewThreadState, curGeckoThreadState); - - const char* isInAutomation = PR_GetEnv("MOZ_IN_AUTOMATION"); - if (!isInAutomation || !(*isInAutomation)) { - MOZ_CRASH("Something triggered the \"quit-application\" notification!"); - } -#endif // defined(EARLY_BETA_OR_EARLIER) - const bool restarting = aData && u"restart"_ns.Equals(aData); java::GeckoThread::SetState(restarting ? java::GeckoThread::State::RESTARTING()