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

Merge "Fix potential NPE in RemoteConnection." into nyc-mr1-dev

Browse Source
This commit is contained in:
Tyler Gunn
2016-09-21 19:56:47 +00:00
committed by Android (Google) Code Review
parent 9096780031 9c2c583ad7
commit 103922f8c6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telecomm/java/android/telecom/RemoteConnection.java
View File

@@ -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();