android: Fix version string on older Android releases

SECURITY_PATCH is apparently only available since Android 6.
This commit is contained in:
Tobias Brunner
2017-07-04 11:54:57 +02:00
parent 480d56da5f
commit a63b0f9982
@@ -1031,8 +1031,12 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
*/ */
private static String getAndroidVersion() private static String getAndroidVersion()
{ {
return "Android " + Build.VERSION.RELEASE + " - " + Build.DISPLAY + String version = "Android " + Build.VERSION.RELEASE + " - " + Build.DISPLAY;
"/" + Build.VERSION.SECURITY_PATCH; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
{
version += "/" + Build.VERSION.SECURITY_PATCH;
}
return version;
} }
/** /**