Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a24642 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Fix potential NPE in RemoteConnection. 

am: 9c2c583a

Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
parents 1c49ec37 9c2c583a

telecomm/java/android/telecom/RemoteConnection.java

+6 −1
Original line number Diff line number Diff line
@@ -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();