For #4132: remove BrowserPerformanceTestActivity & usages.
parent
c1c7de5c1a
commit
27c8a77c3f
|
@ -3,7 +3,6 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Bundle
|
|
||||||
import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
|
import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
|
||||||
import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
|
import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
|
||||||
import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
|
import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
|
||||||
|
@ -17,7 +16,6 @@ import org.mozilla.geckoview.GeckoRuntime
|
||||||
import org.mozilla.geckoview.GeckoRuntimeSettings
|
import org.mozilla.geckoview.GeckoRuntimeSettings
|
||||||
|
|
||||||
object GeckoProvider {
|
object GeckoProvider {
|
||||||
var testConfig: Bundle? = null
|
|
||||||
private var runtime: GeckoRuntime? = null
|
private var runtime: GeckoRuntime? = null
|
||||||
|
|
||||||
@Synchronized
|
@Synchronized
|
||||||
|
@ -40,11 +38,6 @@ object GeckoProvider {
|
||||||
): GeckoRuntime {
|
): GeckoRuntime {
|
||||||
val builder = GeckoRuntimeSettings.Builder()
|
val builder = GeckoRuntimeSettings.Builder()
|
||||||
|
|
||||||
testConfig?.let {
|
|
||||||
builder.extras(it)
|
|
||||||
.remoteDebuggingEnabled(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
val runtimeSettings = builder
|
val runtimeSettings = builder
|
||||||
.crashHandler(CrashHandlerService::class.java)
|
.crashHandler(CrashHandlerService::class.java)
|
||||||
.telemetryDelegate(GeckoAdapter())
|
.telemetryDelegate(GeckoAdapter())
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Bundle
|
|
||||||
import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
|
import mozilla.components.browser.engine.gecko.autofill.GeckoLoginDelegateWrapper
|
||||||
import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
|
import mozilla.components.browser.engine.gecko.ext.toContentBlockingSetting
|
||||||
import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
|
import mozilla.components.browser.engine.gecko.glean.GeckoAdapter
|
||||||
|
@ -17,7 +16,6 @@ import org.mozilla.geckoview.GeckoRuntime
|
||||||
import org.mozilla.geckoview.GeckoRuntimeSettings
|
import org.mozilla.geckoview.GeckoRuntimeSettings
|
||||||
|
|
||||||
object GeckoProvider {
|
object GeckoProvider {
|
||||||
var testConfig: Bundle? = null
|
|
||||||
private var runtime: GeckoRuntime? = null
|
private var runtime: GeckoRuntime? = null
|
||||||
|
|
||||||
@Synchronized
|
@Synchronized
|
||||||
|
@ -40,11 +38,6 @@ object GeckoProvider {
|
||||||
): GeckoRuntime {
|
): GeckoRuntime {
|
||||||
val builder = GeckoRuntimeSettings.Builder()
|
val builder = GeckoRuntimeSettings.Builder()
|
||||||
|
|
||||||
testConfig?.let {
|
|
||||||
builder.extras(it)
|
|
||||||
.remoteDebuggingEnabled(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
val runtimeSettings = builder
|
val runtimeSettings = builder
|
||||||
.crashHandler(CrashHandlerService::class.java)
|
.crashHandler(CrashHandlerService::class.java)
|
||||||
.telemetryDelegate(GeckoAdapter())
|
.telemetryDelegate(GeckoAdapter())
|
||||||
|
|
|
@ -217,11 +217,6 @@
|
||||||
|
|
||||||
<activity android:name=".widget.VoiceSearchActivity" />
|
<activity android:name=".widget.VoiceSearchActivity" />
|
||||||
|
|
||||||
<activity
|
|
||||||
android:name=".browser.BrowserPerformanceTestActivity"
|
|
||||||
android:enabled="${isRaptorEnabled}"
|
|
||||||
android:exported="${isRaptorEnabled}" />
|
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".settings.account.AuthCustomTabActivity"
|
android:name=".settings.account.AuthCustomTabActivity"
|
||||||
android:autoRemoveFromRecents="false"
|
android:autoRemoveFromRecents="false"
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
package org.mozilla.fenix.browser
|
|
||||||
|
|
||||||
import GeckoProvider
|
|
||||||
import android.app.Activity
|
|
||||||
import android.content.Intent
|
|
||||||
import android.os.Bundle
|
|
||||||
import mozilla.components.support.utils.SafeIntent
|
|
||||||
import org.mozilla.fenix.IntentReceiverActivity
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This activity is used for performance testing with Raptor/tp6:
|
|
||||||
* https://wiki.mozilla.org/Performance_sheriffing/Raptor
|
|
||||||
*/
|
|
||||||
class BrowserPerformanceTestActivity : Activity() {
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
|
|
||||||
GeckoProvider.testConfig = SafeIntent(intent).extras
|
|
||||||
|
|
||||||
val intent = Intent(intent)
|
|
||||||
|
|
||||||
intent.setClassName(applicationContext, IntentReceiverActivity::class.java.name)
|
|
||||||
|
|
||||||
startActivity(intent)
|
|
||||||
|
|
||||||
finish()
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -10,7 +10,6 @@ import android.os.Bundle
|
||||||
import mozilla.components.support.utils.RunWhenReadyQueue
|
import mozilla.components.support.utils.RunWhenReadyQueue
|
||||||
import org.mozilla.fenix.HomeActivity
|
import org.mozilla.fenix.HomeActivity
|
||||||
import org.mozilla.fenix.IntentReceiverActivity
|
import org.mozilla.fenix.IntentReceiverActivity
|
||||||
import org.mozilla.fenix.browser.BrowserPerformanceTestActivity
|
|
||||||
import org.mozilla.fenix.settings.account.AuthIntentReceiverActivity
|
import org.mozilla.fenix.settings.account.AuthIntentReceiverActivity
|
||||||
import org.mozilla.fenix.widget.VoiceSearchActivity
|
import org.mozilla.fenix.widget.VoiceSearchActivity
|
||||||
|
|
||||||
|
@ -37,8 +36,7 @@ class PerformanceActivityLifecycleCallbacks(
|
||||||
return isTransientActivityInMigrationVariant(activity) ||
|
return isTransientActivityInMigrationVariant(activity) ||
|
||||||
(activity is IntentReceiverActivity) ||
|
(activity is IntentReceiverActivity) ||
|
||||||
(activity is VoiceSearchActivity) ||
|
(activity is VoiceSearchActivity) ||
|
||||||
(activity is AuthIntentReceiverActivity) ||
|
(activity is AuthIntentReceiverActivity)
|
||||||
(activity is BrowserPerformanceTestActivity)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue