Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when making emergency calls" into lmp-mr1-dev

Browse Source
This commit is contained in:
Sailesh Nepal
2015-01-30 00:31:11 +00:00
committed by Android (Google) Code Review
parent b71ac19308 11aeae5e46
commit 38710f03c9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/RemoteConnectionService.java
View File

@@ -235,8 +235,12 @@ final class RemoteConnectionService {
@Override @Override
public void setVideoProvider(String callId, IVideoProvider videoProvider) { public void setVideoProvider(String callId, IVideoProvider videoProvider) {
RemoteConnection.VideoProvider remoteVideoProvider = null;
if (videoProvider != null) {
remoteVideoProvider = new RemoteConnection.VideoProvider(videoProvider);
}
findConnectionForAction(callId, "setVideoProvider") findConnectionForAction(callId, "setVideoProvider")
.setVideoProvider(new RemoteConnection.VideoProvider(videoProvider)); .setVideoProvider(remoteVideoProvider);
} }
@Override @Override