diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-07-04 11:10:45 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-07-04 11:54:57 +0200 |
| commit | a63b0f9982c220c4061bfbec92f5e48625c19b2c (patch) | |
| tree | e4eb5b8655191bcbd8cb7f8e386d4360dbf5f7c4 /src | |
| parent | 480d56da5f65e073c5d356afc25f0614f7203a1e (diff) | |
| download | strongswan-a63b0f9982c220c4061bfbec92f5e48625c19b2c.tar.bz2 strongswan-a63b0f9982c220c4061bfbec92f5e48625c19b2c.tar.xz | |
android: Fix version string on older Android releases
SECURITY_PATCH is apparently only available since Android 6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java | 8 |
1 files 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; } /** |