summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--telecomm/java/android/telecom/RemoteConnection.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java
index dc8eaf640537..f0301155a322 100644
--- a/telecomm/java/android/telecom/RemoteConnection.java
+++ b/telecomm/java/android/telecom/RemoteConnection.java
@@ -638,7 +638,12 @@ public final class RemoteConnection {
mConnectionCapabilities = connection.getConnectionCapabilities();
mConnectionProperties = connection.getConnectionProperties();
mVideoState = connection.getVideoState();
- mVideoProvider = new RemoteConnection.VideoProvider(connection.getVideoProvider());
+ IVideoProvider videoProvider = connection.getVideoProvider();
+ if (videoProvider != null) {
+ mVideoProvider = new RemoteConnection.VideoProvider(videoProvider);
+ } else {
+ mVideoProvider = null;
+ }
mIsVoipAudioMode = connection.getIsVoipAudioMode();
mStatusHints = connection.getStatusHints();
mAddress = connection.getHandle();