diff --git a/libLinphoneAndroidSdk.gradle b/libLinphoneAndroidSdk.gradle index ef88d09cc..79a59d80d 100644 --- a/libLinphoneAndroidSdk.gradle +++ b/libLinphoneAndroidSdk.gradle @@ -86,6 +86,7 @@ task(releaseJavadoc, type: Javadoc, dependsOn: "assembleRelease") { classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += files(android.libraryVariants.release.javaCompile.classpath.files) classpath += configurations.javadocDeps + options.encoding = 'UTF-8' } task sourcesJar(type: Jar) { diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index aa3f92449..2d418746f 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1328,7 +1328,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou private void requestAudioFocus(int stream){ if (!mAudioFocused){ - int res = mAudioManager.requestAudioFocus(null, stream, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT ); + int res = mAudioManager.requestAudioFocus(null, stream, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE ); Log.d("Audio focus requested: " + (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); if (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) mAudioFocused=true; } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 01ec217fb..25e640640 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 01ec217fbf84c7488afbe36913d4fde5d783b10a +Subproject commit 25e640640000e2ea691c4eb6137e8edebf6b3a52 diff --git a/submodules/belle-sip b/submodules/belle-sip index 3da1dd118..dd5de8022 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 3da1dd118e466c27ffade5af16528dfca145031b +Subproject commit dd5de8022ff5a1ef4ea2d4b2a5761658f1c6010c diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index c72fb8e79..e20c2ed9a 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit c72fb8e7994f1ccb61f89d77fdc9425df53a4033 +Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111