From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 4 Jul 2017 09:10:45 +0000 (+0200)
Subject: android: Fix version string on older Android releases
X-Git-Tag: 5.6.0dr1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a63b0f9982c220c4061bfbec92f5e48625c19b2c;p=thirdparty%2Fstrongswan.git

android: Fix version string on older Android releases

SECURITY_PATCH is apparently only available since Android 6.
---

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 5ef5e87317..d8e07a8739 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;
 	}
 
 	/**