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

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

Browse Source 
automerge: 3f8a5ed

* commit '3f8a5ed5b4907cdaf0813e849e49131c82a3f634':
  Fix crash when making emergency calls
This commit is contained in:
Sailesh Nepal
2015-01-30 00:45:41 +00:00
committed by android-build-merger
parent f1a0a3f842 3f8a5ed5b4
commit 7c2583aea4
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
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