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

Fix potential NPE in RemoteConnection.

Browse Source 
am: 9c2c583ad7

Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
This commit is contained in:
Tyler Gunn
2016-09-21 20:03:22 +00:00
committed by android-build-merger
parent 1c49ec372b 9c2c583ad7
commit 16a2464291
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(); mConnectionCapabilities = connection.getConnectionCapabilities();
mConnectionProperties = connection.getConnectionProperties(); mConnectionProperties = connection.getConnectionProperties();
mVideoState = connection.getVideoState(); 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(); mIsVoipAudioMode = connection.getIsVoipAudioMode();
mStatusHints = connection.getStatusHints(); mStatusHints = connection.getStatusHints();
mAddress = connection.getHandle(); mAddress = connection.getHandle();