diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-27 10:28:30 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-27 10:28:30 -0300 |
| commit | d8e49688e4329f8972ec578e2a6312489e78be6a (patch) | |
| tree | 3d2425ac126cb4d8baec1062f60ea9a7bdb92359 | |
| parent | 5d5e34b17d870cb77c7bd99677523fc25eed8b4f (diff) | |
| parent | 86dab05515889d8c471b6204576dd011ec661b26 (diff) | |
| download | mullvadvpn-d8e49688e4329f8972ec578e2a6312489e78be6a.tar.xz mullvadvpn-d8e49688e4329f8972ec578e2a6312489e78be6a.zip | |
Merge branch 'fix-npe-intent'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b02147e2..6cfbb14bcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ Line wrap the file at 100 chars. Th disconnected for a long time. - Make the settings screen scrollable, so that the quit button is reachable on small screens. - Fix connectivity listener leak causing possible battery usage increase. +- Fix crash that could sometimes happen when restarting the background service. #### Windows - Fix bug where failing to initialize the route manager could cause the daemon to get stuck in a diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index dc8fd223b2..1739f77797 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -80,7 +80,7 @@ class MullvadVpnService : TalpidVpnService() { setUp() } - override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { val startResult = super.onStartCommand(intent, flags, startId) val action = intent?.action |