From f0f33c43f50e9c010fbd29ee14440c91662c0d51 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Mon, 18 Oct 2021 10:59:31 +0200 Subject: [PATCH 1/4] changelog --- CHANGELOG.md | 2 ++ .../io/sentry/android/core/ActivityLifecycleIntegration.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb918fe6d..20334ad246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Fix: Window.FEATURE_NO_TITLE does not work when using activity traces (#) + ## 5.2.3 * Fix: Make ActivityFramesTracker operations thread-safe (#1762) diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java index e870344db3..10cbd78824 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java @@ -227,7 +227,6 @@ private void finishTransaction(final @Nullable ITransaction transaction) { @Override public synchronized void onActivityCreated( final @NonNull Activity activity, final @Nullable Bundle savedInstanceState) { - activityFramesTracker.addActivity(activity); setColdStart(savedInstanceState); addBreadcrumb(activity, "created"); startTracing(activity); @@ -237,6 +236,10 @@ public synchronized void onActivityCreated( @Override public synchronized void onActivityStarted(final @NonNull Activity activity) { + // the screen rendering measurements start for every Activity class when the app calls + // onActivityStarted + activityFramesTracker.addActivity(activity); + addBreadcrumb(activity, "started"); } From fa3c3d5adc7825843cacdae7be3c14ae85cf7d4d Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Mon, 18 Oct 2021 10:59:49 +0200 Subject: [PATCH 2/4] pr id --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20334ad246..514c1bbe0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -* Fix: Window.FEATURE_NO_TITLE does not work when using activity traces (#) +* Fix: Window.FEATURE_NO_TITLE does not work when using activity traces (#1769) ## 5.2.3 From 7435f291862e50b2bbc2deea02dfd3bf881df891 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Mon, 18 Oct 2021 11:13:19 +0200 Subject: [PATCH 3/4] fix unit test --- .../io/sentry/android/core/ActivityLifecycleIntegrationTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt index 01751f1b8e..15fb50499e 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt @@ -273,7 +273,7 @@ class ActivityLifecycleIntegrationTest { sut.register(fixture.hub, fixture.options) val activity = mock() - sut.onActivityCreated(activity, fixture.bundle) + sut.onActivityStarted(activity) verify(fixture.activityFramesTracker).addActivity(eq(activity)) } From 2c2b4e37482f9b595435ee72b59ad05d2de3bd92 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto <5731772+marandaneto@users.noreply.github.com> Date: Mon, 18 Oct 2021 12:47:30 +0200 Subject: [PATCH 4/4] Update sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java Co-authored-by: Philipp Hofmann --- .../sentry/android/core/ActivityLifecycleIntegration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java index 10cbd78824..55ad345e34 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java @@ -236,8 +236,11 @@ public synchronized void onActivityCreated( @Override public synchronized void onActivityStarted(final @NonNull Activity activity) { - // the screen rendering measurements start for every Activity class when the app calls - // onActivityStarted + // The docs on the screen rendering performance tracing + // (https://firebase.google.com/docs/perf-mon/screen-traces?platform=android#definition), + // state that the tracing starts for every Activity class when the app calls .onActivityStarted. + // Adding an Activity in onActivityCreated leads to Window.FEATURE_NO_TITLE not + // working. Moving this to onActivityStarted fixes the problem. activityFramesTracker.addActivity(activity); addBreadcrumb(activity, "started");