diff options
| author | Sailesh Nepal <sail@google.com> | 2015-01-28 16:54:09 -0800 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2015-01-28 16:54:09 -0800 |
| commit | 11aeae5e46541ce40fa26c678a50ba80780aee34 (patch) | |
| tree | 7feb0fd5c836e7c84c2c5cd842983c626cfebd8d /telecomm/java/android/telecom/RemoteConnectionService.java | |
| parent | 597bb6968be56c1b8b0629ba89fec409084cc112 (diff) | |
| download | frameworks_base-11aeae5e46541ce40fa26c678a50ba80780aee34.zip frameworks_base-11aeae5e46541ce40fa26c678a50ba80780aee34.tar.gz frameworks_base-11aeae5e46541ce40fa26c678a50ba80780aee34.tar.bz2 | |
Fix crash when making emergency calls
When making an emergency call the fallback connection
manager would crash. The problem was that the connection
manager would get a setVideoProvider() call even though
it wasn't routing calls.
The root cause of this crash is b/19185063. As a short term
work around I'm adding a null check to avoid the crash.
BUG: 19020123
Change-Id: Ibe4a791882c9b5e21ae629a63f8d89cd3deba828
Diffstat (limited to 'telecomm/java/android/telecom/RemoteConnectionService.java')
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index 073dcd5..43a92cb 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -235,8 +235,12 @@ final class RemoteConnectionService { @Override public void setVideoProvider(String callId, IVideoProvider videoProvider) { + RemoteConnection.VideoProvider remoteVideoProvider = null; + if (videoProvider != null) { + remoteVideoProvider = new RemoteConnection.VideoProvider(videoProvider); + } findConnectionForAction(callId, "setVideoProvider") - .setVideoProvider(new RemoteConnection.VideoProvider(videoProvider)); + .setVideoProvider(remoteVideoProvider); } @Override |