Merge branch 'master' of git.linphone.org:linphone-android

Conflicts:
	src/org/linphone/core/Version.java

Add neon check on first launch
This commit is contained in:
Guillaume Beraudo 2011-04-19 11:48:28 +02:00
commit e5e1f29528

View file

@ -28,6 +28,9 @@ public class Version {
public static final String TAG="Linphone";
private static native boolean nativeHasNeon();
private static Boolean hasNeon;
private static final int buildVersion =
Integer.parseInt(Build.VERSION.SDK);
// 8; // 2.2
@ -52,6 +55,9 @@ public class Version {
} catch (Throwable e) {}
return false;
}
public static boolean hasNeon(){
if (hasNeon == null) hasNeon = nativeHasNeon();
return hasNeon;
}
}
}