commit 722f9a0f024c05ddc4cc7384f924e35be666fc07
author Amit Mahajan <amitmahajan@google.com> Mon Oct 10 10:49:37 2016 -0700
committer Amit Mahajan <amitmahajan@google.com> Tue Oct 11 13:59:21 2016 -0700
tree c1c6a227be684b7e50a6000c85acc23e3759803a
parent 6b8591100999ba4f12f8b519c0444fb89cb8617a

Remove additional logic around broadcasting emergency call state changes

Should be based only on carrier config. Wifi can decide if it should
disable on receiving the broadcasts based on its own config.

Bug: 31861987
Change-Id: If31d73deaea2a1e0bb34fbb33e594a3272732921

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

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 7fcd18c..ffcf6c7 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -185,8 +185,6 @@
 
     private int mRilVersion;
     private boolean mBroadcastEmergencyCallStateChanges = false;
-    // flag to indicate if emergency call end broadcast should be sent
-    boolean mSendEmergencyCallEnd = true;
 
     // Constructors
 
@@ -639,24 +637,11 @@
     @Override
     public void sendEmergencyCallStateChange(boolean callActive) {
         if (mBroadcastEmergencyCallStateChanges) {
-            if (callActive &&
-                    getServiceState().getRilDataRadioTechnology() == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN) {
-                // if emergency call is started while on iwlan, do not send the start or end
-                // broadcast
-                mSendEmergencyCallEnd = false;
-                if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallStateChange: not sending call start " +
-                        "intent as voice tech is IWLAN");
-            } else if (callActive || mSendEmergencyCallEnd) {
-                Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);
-                intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);
-                SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
-                ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL);
-                if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallStateChange");
-            } else {
-                if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallStateChange: not sending call end " +
-                        "intent as start was not sent");
-                mSendEmergencyCallEnd = true;
-            }
+            Intent intent = new Intent(TelephonyIntents.ACTION_EMERGENCY_CALL_STATE_CHANGED);
+            intent.putExtra(PhoneConstants.PHONE_IN_EMERGENCY_CALL, callActive);
+            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, getPhoneId());
+            ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL);
+            if (DBG) Rlog.d(LOG_TAG, "sendEmergencyCallStateChange: callActive " + callActive);
         }
     }