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

This commit is contained in:
Sailesh Nepal
2015-01-30 00:31:11 +00:00
committed by Android (Google) Code Review

View File

@@ -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