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

Commit 58ebc947 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Fix potential NPE in RemoteConnection. am: 9c2c583a am: 16a24642 

am: 78e81ce2

Change-Id: I118a082f5f5724b48a4410a787272623d01051ba
parents aae6a6cc 78e81ce2

telecomm/java/android/telecom/RemoteConnection.java

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