commit 17010e559b99302cd64450a92e30c7817128035d
author Roshan Pius <rpius@google.com> Thu Aug 13 13:05:35 2015 -0700
committer Roshan Pius <rpius@google.com> Thu Aug 13 13:08:20 2015 -0700
tree 5e34de7063fbeb076836e5f3cfa242270e0e3aa0
parent 1076675f0fecfe4293b92cab3afcb873b267dae4

Disallow resetting of emergency flag in telecom.

Once a call is marked as an emergency call in telecom, prevent
resetting the flag from lower layers.

BUG: 22851640
Change-Id: I3880871c33b691040984e631b0da8170ac9356b9

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

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 9d8026f..da6dc52 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -633,8 +633,12 @@
                 }
             }
 
-            mIsEmergencyCall = mHandle != null && PhoneNumberUtils.isLocalEmergencyNumber(mContext,
-                    mHandle.getSchemeSpecificPart());
+            // Let's not allow resetting of the emergency flag. Once a call becomes an emergency
+            // call, it will remain so for the rest of it's lifetime.
+            if (!mIsEmergencyCall) {
+                mIsEmergencyCall = mHandle != null && PhoneNumberUtils.isLocalEmergencyNumber(
+                        mContext, mHandle.getSchemeSpecificPart());
+            }
             startCallerInfoLookup();
             for (Listener l : mListeners) {
                 l.onHandleChanged(this);