commit 54e563bd1e42657cd86dc63e85a52ddc73ba05ae
author Jay Shrauner <shrauner@google.com> Sat Sep 27 23:57:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 27 23:57:45 2014 +0000
tree ef25fe70115a77b111aa4d21a6064dba8f46da57
parent 36bf1ca0a2eae3f40bc94e931e399100d7a14482
parent f211ce79c1034315d454289ed233c11dd3aa4d0f

Merge "Fix NPE when disconnect cause wasn't set" into lmp-dev

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

diff --git a/src/com/android/server/telecom/PhoneStateBroadcaster.java b/src/com/android/server/telecom/PhoneStateBroadcaster.java
index 0c16689..b96eb02 100644
--- a/src/com/android/server/telecom/PhoneStateBroadcaster.java
+++ b/src/com/android/server/telecom/PhoneStateBroadcaster.java
@@ -61,9 +61,17 @@
 
     @Override
     public void onCallRemoved(Call call) {
-        if (!CallsManager.getInstance().hasAnyCalls()) {
-            sendPhoneStateChangedBroadcast(call, TelephonyManager.CALL_STATE_IDLE);
+        // Recalculate the current phone state based on the consolidated state of the remaining
+        // calls in the call list.
+        final CallsManager callsManager = CallsManager.getInstance();
+        int callState = TelephonyManager.CALL_STATE_IDLE;
+        if (callsManager.hasRingingCall()) {
+            callState = TelephonyManager.CALL_STATE_RINGING;
+        } else if (callsManager.getFirstCallWithState(CallState.DIALING, CallState.ACTIVE,
+                    CallState.ON_HOLD) != null) {
+            callState = TelephonyManager.CALL_STATE_OFFHOOK;
         }
+        sendPhoneStateChangedBroadcast(call, callState);
     }
 
     int getCallState() {