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

Commit bdb38032 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

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

parents 0c6d28bf f0071532

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
@@ -1993,6 +1993,7 @@ public class ImsManager implements IFeatureConnector { 


            return call;

        } catch (Throwable t) {

            loge("takeCall caught: ", t);

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

        }

    }