From d1be587f12e7d9f3211f6b768fa6421ca68ef1cb Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 14 Oct 2011 16:58:55 +0200 Subject: [PATCH] Update dependencies. --- src/org/linphone/DialerActivity.java | 7 +------ submodules/externals/osip | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 7d8ff41a5..0ecfb3767 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -86,7 +86,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin private PowerManager.WakeLock mWakeLock; private SharedPreferences mPref; - private LinphoneCall mCurrentCall; private boolean useIncallActivity; private boolean useVideoActivity; private boolean useConferenceActivity; @@ -442,7 +441,7 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin public void onCallStateChanged(LinphoneCall call, State state, String message) { - Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message, ", currentCall=", mCurrentCall); + Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); if (lc==null) { /* we are certainly exiting, ignore then.*/ @@ -450,12 +449,10 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin } if (state==LinphoneCall.State.OutgoingInit){ - mCurrentCall=call; call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); enterIncallMode(lc); LinphoneActivity.instance().startOrientationSensor(); }else if (state==LinphoneCall.State.IncomingReceived){ - mCurrentCall=call; callPending(call); call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); LinphoneActivity.instance().startOrientationSensor(); @@ -469,13 +466,11 @@ public class DialerActivity extends Activity implements LinphoneGuiListener, Lin if (mWakeLock.isHeld()) mWakeLock.release(); exitCallMode(); LinphoneActivity.instance().stopOrientationSensor(); - mCurrentCall=null; } }else if (state==LinphoneCall.State.CallEnd){ if (lc.getCallsNb() == 0){ exitCallMode(); LinphoneActivity.instance().stopOrientationSensor(); - mCurrentCall=null; } } diff --git a/submodules/externals/osip b/submodules/externals/osip index c27b9b670..9e8c64cff 160000 --- a/submodules/externals/osip +++ b/submodules/externals/osip @@ -1 +1 @@ -Subproject commit c27b9b6702f62cdbd2143c1ccc85b8980b83adac +Subproject commit 9e8c64cff496d2794fe352a6a3907e0e36988931 diff --git a/submodules/linphone b/submodules/linphone index a0f8cbb73..e740628ab 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a0f8cbb73c1c028182972147d1ce3f0fdae2921f +Subproject commit e740628ab7cb69acae8751572506dfc840028607