commit 4b77f94c3978b11e5534ea631a319dbcadbe7a5c
author Yorke Lee <yorkelee@google.com> Fri May 15 20:35:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 20:35:16 2015 +0000
tree bfac3bb3795231f33601e28e19b17e47507431f7
parent 23c11e2c460eaabf9f9fb482dde46a2872c74819
parent 609693ab4c3ab7475d0993c4a219868a81f6eed1

am 609693ab: am a319842d: am 4c9a8cf0: Merge "Fix potential Dialer NPEs" into mnc-dev

* commit '609693ab4c3ab7475d0993c4a219868a81f6eed1':
  Fix potential Dialer NPEs

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 25828e5..56d5ad1 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -721,7 +721,7 @@
      * @see #commitDialpadFragmentHide
      */
     public void hideDialpadFragment(boolean animate, boolean clearDialpad) {
-        if (mDialpadFragment == null) {
+        if (mDialpadFragment == null || mDialpadFragment.getView() == null) {
             return;
         }
         if (clearDialpad) {

src/com/android/dialer/dialpad/DialpadFragment.java

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index a1ba150..8d27c14 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1107,7 +1107,9 @@
     }
 
     public void clearDialpad() {
-        mDigits.getText().clear();
+        if (mDigits != null) {
+            mDigits.getText().clear();
+        }
     }
 
     private void handleDialButtonClickWithEmptyDigits() {