From 22ee956dd53b9f479594ea4278d9d2ccbc2cd2ea Mon Sep 17 00:00:00 2001
From: Robert-Louis Milin <milinmt@gmail.com>
Date: Thu, 27 Apr 2023 15:17:41 -0400
Subject: [PATCH] fix(Geolocator): Stop using location when unsubscribing  from
 events.

---
 src/Uno.UWP/Devices/Geolocation/Geolocator.Android.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Uno.UWP/Devices/Geolocation/Geolocator.Android.cs b/src/Uno.UWP/Devices/Geolocation/Geolocator.Android.cs
index 884c2bf9cb34..9ecbd414bcc7 100644
--- a/src/Uno.UWP/Devices/Geolocation/Geolocator.Android.cs
+++ b/src/Uno.UWP/Devices/Geolocation/Geolocator.Android.cs
@@ -310,7 +310,12 @@ partial void StartPositionChanged()
 		RestartUpdates();
 	}
 
-	partial void StopPositionChanged() => _positionChangedSubscriptions.TryRemove(this, out var _);
+	partial void StopPositionChanged()
+	{
+		_positionChangedSubscriptions.TryRemove(this, out _);
+		RemoveUpdates();
+		BroadcastStatusChanged(PositionStatus.Disabled);
+	}
 
 	private async Task<bool> TryWaitForGetGeopositionAsync(TimeSpan timeout, DateTime earliestDate)
 	{