From 825dff27fc23402f6c25ce059f6f777d46f021d8 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 9 Jun 2022 18:06:08 +0100
Subject: [PATCH] Exit if BriarService finds lifecycle already running.

---
 .../java/org/briarproject/briar/android/BriarService.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
index 70be9f0e9..d114d107b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarService.java
@@ -156,8 +156,11 @@ public class BriarService extends Service {
 				if (result == SUCCESS) {
 					started = true;
 				} else if (result == ALREADY_RUNNING) {
-					LOG.info("Already running");
-					stopSelf();
+					LOG.warning("Already running");
+					// The LifecycleManager has outlived the BriarService
+					// instance that created it. Rather than trying to recover
+					// from this unexpected state, try to exit cleanly
+					shutdownFromBackground();
 				} else {
 					if (LOG.isLoggable(WARNING))
 						LOG.warning("Startup failed: " + result);