From a63b0f9982c220c4061bfbec92f5e48625c19b2c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 4 Jul 2017 11:10:45 +0200 Subject: android: Fix version string on older Android releases SECURITY_PATCH is apparently only available since Android 6. --- .../main/java/org/strongswan/android/logic/CharonVpnService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index 5ef5e8731..d8e07a873 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -1031,8 +1031,12 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe */ private static String getAndroidVersion() { - return "Android " + Build.VERSION.RELEASE + " - " + Build.DISPLAY + - "/" + Build.VERSION.SECURITY_PATCH; + String version = "Android " + Build.VERSION.RELEASE + " - " + Build.DISPLAY; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) + { + version += "/" + Build.VERSION.SECURITY_PATCH; + } + return version; } /** -- cgit v1.2.3