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

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

Merge "Prevent TelecomManager#endCall from ending emergency calls." into qt-dev 

am: 136e82f7

Change-Id: Id63e4c127c61e52dac08fd872cf7d3bfd2fa9158
parents 6ebd7c5c 136e82f7

src/com/android/server/telecom/TelecomServiceImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,11 @@ public class TelecomServiceImpl { 
        }



        if (call != null) {

            if (call.isEmergencyCall()) {

                android.util.EventLog.writeEvent(0x534e4554, "132438333", -1, "");

                return false;

            }



            if (call.getState() == CallState.RINGING) {

                call.reject(false /* rejectWithMessage */, null, callingPackage);

            } else {