diff --git a/project.properties b/project.properties index a2bff5858..019cc5583 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-17 android.library=false diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index f8e013523..1c8dcffcd 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -74,6 +74,7 @@ import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneInfoMessage; import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.PayloadType; +import org.linphone.core.PublishState; import org.linphone.core.SubscriptionState; import org.linphone.mediastream.Log; import org.linphone.mediastream.Version; @@ -1795,4 +1796,10 @@ public class LinphoneManager implements LinphoneCoreListener { Log.d("Notify received for event "+eventName); if (content!=null) Log.d("with content "+content.getType()+"/"+content.getSubtype()+" data:"+content.getDataAsString()); } + @Override + public void publishStateChanged(LinphoneCore lc, LinphoneEvent ev, + PublishState state) { + // TODO Auto-generated method stub + + } } diff --git a/submodules/belle-sip b/submodules/belle-sip index a9ab01ca8..326aa5d54 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a9ab01ca87d0c4dfa3e602bbf0018d435557e225 +Subproject commit 326aa5d540cfeeecdae56ef1bf8fe7dc7823d146 diff --git a/submodules/linphone b/submodules/linphone index a1ec7d696..255eaef30 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a1ec7d69658b8b534a9c5b6ca446dddd82442b41 +Subproject commit 255eaef302646298a9790672264b51e3de17db5c