From 70ee79baacefca644bfe0a39fc04970d012c0a39 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Thu, 5 Mar 2020 14:21:08 +0100 Subject: [PATCH] Fixes an AC issue with FxA and the account state after rebooting --- .../mozilla/vrbrowser/telemetry/GleanMetricsService.java | 2 +- build.gradle | 2 +- versions.gradle | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/telemetry/GleanMetricsService.java b/app/src/common/shared/org/mozilla/vrbrowser/telemetry/GleanMetricsService.java index dbceba2f4..6e065a49c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/telemetry/GleanMetricsService.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/telemetry/GleanMetricsService.java @@ -52,7 +52,7 @@ public static void init(Context aContext) { GleanMetricsService.stop(); } Configuration config = new Configuration(Configuration.DEFAULT_TELEMETRY_ENDPOINT, BuildConfig.BUILD_TYPE); - Glean.INSTANCE.initialize(aContext, true, config); + Glean.INSTANCE.initialize(aContext, config); } // It would be called when users turn on/off the setting of telemetry. diff --git a/build.gradle b/build.gradle index 6b2f10441..c94fe430a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { addRepos(repositories) dependencies { classpath 'com.android.tools.build:gradle:3.4.2' - classpath "org.mozilla.telemetry:glean-gradle-plugin:$versions.telemetry" + classpath "org.mozilla.telemetry:glean-gradle-plugin:$versions.android_components" classpath "$deps.kotlin.plugin" // NOTE: Do not place your application dependencies here; they belong diff --git a/versions.gradle b/versions.gradle index d42b6c5fe..4d61e37b4 100644 --- a/versions.gradle +++ b/versions.gradle @@ -25,13 +25,13 @@ def versions = [:] // GeckoView versions can be found here: // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/ versions.gecko_view = "75.0.20200304084140" -versions.android_components = "28.0.1" +versions.android_components = "21.0.0" // Note that android-components also depends on application-services, // and in fact is our main source of appservices-related functionality. // The version number below tracks the application-services version // that we depend on directly for its rustlog package, and it's important // that it be kept insync with the version used by android-components above. -versions.mozilla_appservices = "0.48.2" +versions.mozilla_appservices = "0.42.2" versions.mozilla_speech = "1.0.11" versions.openwnn = "1.3.7" versions.google_vr = "1.190.0" @@ -52,7 +52,7 @@ versions.snakeyaml = "1.24" versions.gson = "2.8.5" versions.robolectric = "4.2.1" versions.work = "2.2.0" -versions.telemetry = "24.1.0" +versions.telemetry = "22.0.0" ext.versions = versions def deps = [:]