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

liblinphone updated

Browse source
This commit is contained in:
Sylvain Berfini 2012-10-02 17:08:46 +02:00
parent 9ecd852a23
commit ade1bd9904
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/LinphoneActivity.java
View file

@ -1105,8 +1105,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
} }
} }
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) { if (keyCode == KeyEvent.KEYCODE_BACK) {
if (currentFragment == FragmentsAvailable.DIALER) { if (currentFragment == FragmentsAvailable.DIALER) {

6
src/org/linphone/LinphoneManager.java
View file

@ -468,7 +468,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
} }
private synchronized void startLibLinphone() { private synchronized void startLibLinphone() {
try { try {
copyAssetsFromPackage(); copyAssetsFromPackage();
@ -899,6 +898,11 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
} }
@Override
public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) {
Log.d("DTMF received: " + dtmf);
}
public String getLastLcStatusMessage() { public String getLastLcStatusMessage() {
return lastLcStatusMessage; return lastLcStatusMessage;
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 61312092bbda523c8fa98c9804d123a5308d2e57 Subproject commit 8bec813e52a4949f723b94918f4eb37ac5faad86