diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/res/values-de/strings.xml
index a04da7208..bb4cf5d3a 100644
--- a/src/frontends/android/res/values-de/strings.xml
+++ b/src/frontends/android/res/values-de/strings.xml
@@ -25,6 +25,7 @@
Suchen
VPN nicht unterstützt
Ihr Gerät unterstützt keine VPN Anwendungen.\nBitte kontaktieren Sie den Hersteller.
+ VPN Verbindungen sind nicht möglich im abgeriegelten Modus.
Laden…
diff --git a/src/frontends/android/res/values-pl/strings.xml b/src/frontends/android/res/values-pl/strings.xml
index 54f4259ae..58d158b8e 100644
--- a/src/frontends/android/res/values-pl/strings.xml
+++ b/src/frontends/android/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
Szukaj
Nie obsługiwany VPN
Urządzenie nie obsługuje aplikacji VPN.\nProszę skontaktować się z producentem.
+ Polączenia nie sa możliwe w trybie zamkniętym
Wczytywanie…
diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/res/values/strings.xml
index 3e4b746fd..4b332348d 100644
--- a/src/frontends/android/res/values/strings.xml
+++ b/src/frontends/android/res/values/strings.xml
@@ -25,6 +25,7 @@
Search
VPN not supported
Your device does not support VPN applications.\nPlease contact the manufacturer.
+ VPN connections are not supported in lockdown mode.
Loading…
diff --git a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
index 77ab56306..4ccf7d314 100644
--- a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
@@ -95,7 +95,17 @@ public class MainActivity extends Activity implements OnVpnProfileSelectedListen
*/
protected void prepareVpnService(Bundle profileInfo)
{
- Intent intent = VpnService.prepare(this);
+ Intent intent;
+ try
+ {
+ intent = VpnService.prepare(this);
+ }
+ catch (IllegalStateException ex)
+ {
+ /* this happens if the always-on VPN feature (Android 4.2+) is activated */
+ VpnNotSupportedError.showWithMessage(this, R.string.vpn_not_supported_during_lockdown);
+ return;
+ }
/* store profile info until the user grants us permission */
mProfileInfo = profileInfo;
if (intent != null)