commit e01da9a84f49b3e7ff4c8a876cdeb32b7beec1ea
author Tyler Gunn <tgunn@google.com> Mon May 13 13:58:15 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 12 09:55:57 2019 +0000
tree ac83e0ee535aa2b9602328ccc22e76c7010b8a79
parent b65ecc5a1264c78e2543dc6beade501c4d60b282

Prevent TelecomManager#endCall from ending emergency calls.

Test: Manual test with test emergency number.
Fixes: 132438333
Change-Id: I4c29a707ec06059b984b61da7d0425a6082476aa
(cherry picked from commit 8d57e376b43326db2cb3b51c375ebf2e6ce40840)

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

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index ea55e63..ded42db 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -1580,6 +1580,11 @@
         }
 
         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 {