Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-android
Commits
885cc3c5
Commit
885cc3c5
authored
8 years ago
by
Erwan Croze
Browse files
Options
Download
Patches
Plain Diff
Fix crash which occur sometimes on the add of video
parent
4ce4a2a8
master
3.3.x
3.4.x
feature/5.3
feature/UZ-8
feature/call_uitests
feature/kotlin_rewrite
feature/logcat_view
feature/show_unsecure_conversation_event_at_top
feature/use_theme_main_color_for_icon_and_splashscreen
fix/insistent_notification
fix/restore_previous_release_ringtone_player
fix/telecom_default_audio_endpoint
release/4.0.1
release/4.1
release/4.2
release/4.3
release/4.4
release/4.5
release/4.6
release/4.7
release/5.0
release/5.1
release/5.2
release/6.0
test/UZ-8-no-telecom
6.1.0-alpha
6.0.0
6.0.0-beta
6.0.0-alpha
5.3.0-alpha
5.2.5
5.2.4
5.2.3
5.2.2
5.2.1
5.2.0
5.2.0-beta
5.2.0-alpha
5.1.4
5.1.3
5.1.2
5.1.1
5.1.0
5.1.0-beta
5.1.0-alpha
5.0.14
5.0.13
5.0.12
5.0.11
5.0.10
5.0.9
5.0.8
5.0.7
5.0.6
5.0.5
5.0.4
5.0.3
5.0.2
5.0.1
5.0.0
4.7.0-beta
4.7.0-alpha
4.6.14
4.6.13
4.6.12
4.6.11
4.6.10
4.6.9
4.6.8
4.6.7
4.6.6
4.6.5
4.6.4
4.6.3
4.6.2
4.6.1
4.6.0
4.6.0-beta
4.6.0-alpha
4.5.6
4.5.5
4.5.4
4.5.3
4.5.2
4.5.1
4.5.0
4.5.0-beta
4.5.0-alpha
4.4.4
4.4.3
4.4.2
4.4.1
4.4.0
4.4.0-beta
4.4.0-alpha
4.3.1
4.3.0
4.3.0-beta
4.3-alpha
4.2.3
4.2.2
4.2.1
4.2.0-beta
4.2.0-alpha
4.2
4.1.1
4.1
4.0.1
4.0.0
3.99.9
3.99.7
3.99.5
3.99.4
3.99.3
3.99.1
3.4.1
3.4.0
3.3.2
3.3.1
3.3.0
3.2.7
3.2.6
3.2.5
2.0.10
2.0.7
2.0.4
1.4.5
1.4.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/org/linphone/CallActivity.java
+3
-3
src/org/linphone/CallActivity.java
with
3 additions
and
3 deletions
src/org/linphone/CallActivity.java
+
3
−
3
View file @
885cc3c5
...
...
@@ -127,7 +127,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private
LinphoneCoreListenerBase
mListener
;
private
DrawerLayout
sideMenu
;
private
boolean
mProximitySensingEnabled
;
private
Handler
mHandler
=
new
Handler
();
private
Timer
mTimer
;
private
TimerTask
mTask
;
...
...
@@ -763,7 +763,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
LinphoneManager
.
getLc
().
updateCall
(
call
,
params
);
}
else
{
videoProgress
.
setVisibility
(
View
.
VISIBLE
);
if
(!
call
.
getRemoteParams
().
isLowBandwidthEnabled
())
{
if
(
call
.
getRemoteParams
()
!=
null
&&
!
call
.
getRemoteParams
().
isLowBandwidthEnabled
())
{
LinphoneManager
.
getInstance
().
addVideo
();
}
else
{
displayCustomToast
(
getString
(
R
.
string
.
error_low_bandwidth
),
Toast
.
LENGTH_LONG
);
...
...
@@ -1651,7 +1651,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
getString
(
R
.
string
.
call_stats_video_resolution_received
),
"\u2193 "
+
params
.
getReceivedVideoSize
().
toDisplayableString
());
}
else
{
formatText
(
jitterBuffer
,
getString
(
R
.
string
.
call_stats_jitter_buffer
),
formatText
(
jitterBuffer
,
getString
(
R
.
string
.
call_stats_jitter_buffer
),
new
DecimalFormat
(
"##.##"
).
format
(
stats
.
getJitterBufferSize
())
+
" ms"
);
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets