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

Commit 52882ce2 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when creating an ImsCall." into rvc-dev am:... 

Merge "Fix potential NPE when creating an ImsCall." into rvc-dev am: bdb38032 am: 9ab9102c am: 39adf369 am: 8fd8c8fc

Change-Id: Iecace513efe56f82a292da3b12a788f881cca192
parents d1b05d3e 8fd8c8fc

src/java/com/android/ims/ImsCall.java

+2 −1
Original line number Diff line number Diff line
@@ -3672,7 +3672,8 @@ public class ImsCall implements ICall { 
     * @param profile The current {@link ImsCallProfile} for the call.

     */

    private void trackVideoStateHistory(ImsCallProfile profile) {

        mWasVideoCall = mWasVideoCall || profile.isVideoCall();

        mWasVideoCall = mWasVideoCall

                || profile != null ? profile.isVideoCall() : false;

    }



    /**

src/java/com/android/ims/ImsManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,7 @@ public class ImsManager implements IFeatureConnector { 


            return call;

        } catch (Throwable t) {

            loge("takeCall caught: ", t);

            throw new ImsException("takeCall()", t, ImsReasonInfo.CODE_UNSPECIFIED);

        }

    }