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

Commit 2edf938f authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: aca44d3c am: 26757c4a 

am: 5723b022

Change-Id: I63a3d7beaf229562ef36b831a12b682439aa61db
parents 1d0efbcd 5723b022

src/java/com/android/internal/telephony/TelephonyTester.java

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ public class TelephonyTester { 
        if (extras == null) {

            extras = new Bundle();

        }

        extras.putBoolean(ImsCallProfile.EXTRA_E_CALL, true);

        extras.putBoolean(ImsCallProfile.EXTRA_EMERGENCY_CALL, true);

        callProfile.mCallExtras = extras;

        imsCall.getImsCallSessionListenerProxy().callSessionUpdated(imsCall.getSession(),

                callProfile);

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ public class ImsPhoneConnection extends Connection implements 
    }



    private void updateEmergencyCallFromExtras(Bundle extras) {

        if (extras.getBoolean(ImsCallProfile.EXTRA_E_CALL)) {

        if (extras.getBoolean(ImsCallProfile.EXTRA_EMERGENCY_CALL)) {

            setIsNetworkIdentifiedEmergencyCall(true);

        }

    }