am 121c236f: am ad39c619: Merge "Protect hideDialpad() code with isActivityStarted() check." into klp-dev

* commit '121c236f392be0590371c6b20021cee29bad007f':
  Protect hideDialpad() code with isActivityStarted() check.

1 files changed, 10 insertions, 1 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 541661c57..4b3893994 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -246,7 +246,7 @@ public class InCallPresenter implements CallList.Listener {
      */
     @Override
     public void onDisconnect(Call call) {
-        mInCallActivity.hideDialpadForDisconnect();
+        hideDialpadForDisconnect();
         maybeShowErrorDialogOnDisconnect(call);
 
         // We need to do the run the same code as onCallListChange.
@@ -487,6 +487,15 @@ public class InCallPresenter implements CallList.Listener {
     }
 
     /**
+     * Hides the dialpad.  Called when a call is disconnected (Requires hiding dialpad).
+     */
+    private void hideDialpadForDisconnect() {
+        if (isActivityStarted()) {
+            mInCallActivity.hideDialpadForDisconnect();
+        }
+    }
+
+    /**
      * When the state of in-call changes, this is the first method to get called. It determines if
      * the UI needs to be started or finished depending on the new state and does it.
      */