Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Fixes #2924 Fixes an AC issue with FxA and the account state after rebooting #2925

Merged
merged 1 commit into from
Mar 5, 2020
Merged

Fixes #2924 Fixes an AC issue with FxA and the account state after rebooting #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/telemetry/GleanMetricsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 = [:]
Expand Down