From 060e37054cf81df606b10b09f3bd7d092bc0158c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 17 Jun 2018 11:46:28 +0200 Subject: [PATCH] Fix compilation errors and crashes. --- src/android/org/linphone/LinphoneManager.java | 3 +++ submodules/bctoolbox | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index e9638139f..677f41225 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1770,4 +1770,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou mUnreadChatsPerRoom.put(key, 1); } } + + public void onQrcodeFound(Core lc, String something){ + } } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 48ac645ca..3eef7b372 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 48ac645caa629a65fb164882aeddab7eb13a56a9 +Subproject commit 3eef7b37214cc8a3fc1453fe92ac483a6b388f08 diff --git a/submodules/linphone b/submodules/linphone index 142fdca15..634aaf3cb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 142fdca15504216b6a52e08594c2e35872b0cdbf +Subproject commit 634aaf3cbfcb08e0d1a1c0c92cf5243b893011a4 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index a9f96ff70..e02b12e57 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit a9f96ff708f451d2568d1aa70ea40149d6f8d0ea +Subproject commit e02b12e579faee6c792bcf34c6cca9ac20f88251