am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev

* commit '38710f03c92a57ec00830e146a0714254c635405':
  Fix crash when making emergency calls
This commit is contained in:
Sailesh Nepal
2015-01-30 00:36:07 +00:00
committed by Android Git Automerger

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