Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into dev_group_chat

Browse source
This commit is contained in:
Sylvain Berfini 2018-02-13 15:13:32 +01:00
commit 9afc4c4e54
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libLinphoneAndroidSdk.gradle
View file

@ -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) {

2
src/android/org/linphone/LinphoneManager.java
View file

@ -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;
}

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 01ec217fbf84c7488afbe36913d4fde5d783b10a
Subproject commit 25e640640000e2ea691c4eb6137e8edebf6b3a52

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 3da1dd118e466c27ffade5af16528dfca145031b
Subproject commit dd5de8022ff5a1ef4ea2d4b2a5761658f1c6010c

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit c72fb8e7994f1ccb61f89d77fdc9425df53a4033
Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111