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

Fix potential NPE in RemoteConnection.

Browse Source 
When creating an instance of RemoteConnection, the code does not properly
handle the case where the video provider is null.  This could cause a
RemoteConnection.VideoProvider to be created for a non-existent binder.

Bug: 31372624
Change-Id: I990084e2d2d68cdf2dda426cb58ad68785b35422
This commit is contained in:
Tyler Gunn
2016-09-16 15:08:50 -07:00
parent 63e2d63817
commit 9c2c583ad7
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();