diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java index dc8eaf6405375..f0301155a3226 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();