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

Commit 39adf369 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: bdb38032 am: 9ab9102c 

Change-Id: I3d6a6f60430c6dce34e13d68e1ecad693cc92b8c
parents b7416f1f 9ab9102c

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);

        }

    }