1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index f1b22b855..9650a1fd8 100755
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -2056,12 +2056,14 @@ public class DialpadFragment extends AnalyticsFragment
         PhoneStateListener phoneStateListener = new PhoneStateListener(subId[0]) {
             @Override
             public void onCallStateChanged(int state, String incomingNumber) {
-                if ((state == TelephonyManager.CALL_STATE_IDLE)
+                if ((getActivity() != null) &&
+                        (getTelephonyManager().getCallState() == TelephonyManager.CALL_STATE_IDLE)
                         && isDialpadChooserVisible()) {
                     showDialpadChooser(false);
                 }
-                if (state == TelephonyManager.CALL_STATE_IDLE
-                        && getActivity() != null) {
+                if ((getActivity() != null)
+                        && (getTelephonyManager().getCallState()
+                                == TelephonyManager.CALL_STATE_IDLE)) {
                     ((HostInterface) getActivity()).setConferenceDialButtonVisibility(true);
                 }
             }