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

Commit fd5ba7c7 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 

Change-Id: I6b4e29009b12b479bbf539a73624a3429d33ec8a
parents c8967831 bdb38032

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

        }

    }