From 3eaf57ca7014c8319f3117ddc3234e7ebd38991c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 22 Sep 2016 10:42:51 +0200 Subject: [PATCH] Updated linphone + improved ABI logging --- src/org/linphone/LinphoneService.java | 11 ++++++++--- submodules/linphone | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 844cc9b9b..8f4c0163a 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -31,6 +31,7 @@ import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; +import org.linphone.core.LinphoneCoreFactoryImpl; import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.core.LinphoneProxyConfig; import org.linphone.mediastream.Log; @@ -561,10 +562,14 @@ public final class LinphoneService extends Service { StringBuilder sb = new StringBuilder(); sb.append("DEVICE=").append(Build.DEVICE).append("\n"); sb.append("MODEL=").append(Build.MODEL).append("\n"); - //MANUFACTURER doesn't exist in android 1.5. - //sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n"); + sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n"); sb.append("SDK=").append(Build.VERSION.SDK_INT).append("\n"); - sb.append("EABI=").append(Version.getCpuAbis().get(0)).append("\n"); + sb.append("Supported ABIs="); + for (String abi : Version.getCpuAbis()) { + sb.append(abi + ", "); + } + sb.append("\n"); + sb.append("Used ABI=").append(LinphoneCoreFactoryImpl.ABI).append("\n"); Log.i(sb.toString()); } diff --git a/submodules/linphone b/submodules/linphone index 05d712ecd..e5c5c4514 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 05d712ecdd58c1613f688a33a697b1d795ce8caf +Subproject commit e5c5c45147098164183cf4f11e55730688682a2c