Browse Source

Fix Android app randomly hangs (15807) (#15810)

pull/15753/head
zabolotnev 2 years ago
committed by GitHub
parent
commit
9e6d3cf4ac
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 3
      src/Android/Avalonia.Android/AvaloniaActivity.cs
  2. 7
      src/Android/Avalonia.Android/AvaloniaView.cs

3
src/Android/Avalonia.Android/AvaloniaActivity.cs

@ -122,6 +122,9 @@ public class AvaloniaActivity : AppCompatActivity, IAvaloniaActivity
{
attributes.LayoutInDisplayCutoutMode = LayoutInDisplayCutoutMode.ShortEdges;
}
// We inform the ContentView that it has become visible. OnVisibleChanged() sometimes doesn't get called. Issue #15807.
_view?.OnVisibilityChanged(true);
}
protected override void OnDestroy()

7
src/Android/Avalonia.Android/AvaloniaView.cs

@ -68,9 +68,9 @@ namespace Avalonia.Android
OnVisibilityChanged(visibility == ViewStates.Visible);
}
private void OnVisibilityChanged(bool isVisible)
internal void OnVisibilityChanged(bool isVisible)
{
if (isVisible)
if (isVisible && _timerSubscription == null)
{
if (AvaloniaLocator.Current.GetService<IRenderTimer>() is ChoreographerTimer timer)
{
@ -84,10 +84,11 @@ namespace Avalonia.Android
(insetsManager as AndroidInsetsManager)?.ApplyStatusBarState();
}
}
else
else if (!isVisible && _timerSubscription != null)
{
_root.StopRendering();
_timerSubscription?.Dispose();
_timerSubscription = null;
}
}

Loading…
Cancel
Save