Fix Random Service starts in the client (#3492)

mozilla-mobile · May 11, 2022 · a137512 · a137512
1 parent e8243bb
commit a137512
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/android/daemon/src/main/java/org/mozilla/firefox/vpn/daemon/VPNService.kt b/android/daemon/src/main/java/org/mozilla/firefox/vpn/daemon/VPNService.kt
@@ -67,7 +67,11 @@ class VPNService : android.net.VpnService() {
         intent?.let {
             if (intent.getBooleanExtra("startOnly", false)) {
                 Log.i(tag, "Start only!")
-                return super.onStartCommand(intent, flags, startId)
+                // If this is a Start Only request, the client will soon 
+                // bind to the service anyway. 
+                // We should return START_NOT_STICKY so that after an unbind()
+                // the OS will not try to restart the service.
+                return START_NOT_STICKY
             }
         }
         // This start is from always-on