diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-05-15 10:52:27 -0700 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2015-05-15 10:52:27 -0700 |
| commit | 791b488fb8f835bb7976cb1f839a0b3ccf04132c (patch) | |
| tree | f36fa8694396077f5f02a994e821c30bfa86ee3d | |
| parent | a812d28bfdac171e726d6b865e7ea5cfda24d924 (diff) | |
Fix potential Dialer NPEs
Fix NPEs encountered during monkey tests
Bug: 21167534
Change-Id: I98b6f675adfd233d3583c363f7daeca1bc14d8b7
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 25828e596..56d5ad171 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -721,7 +721,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O * @see #commitDialpadFragmentHide */ public void hideDialpadFragment(boolean animate, boolean clearDialpad) { - if (mDialpadFragment == null) { + if (mDialpadFragment == null || mDialpadFragment.getView() == null) { return; } if (clearDialpad) { diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index a1ba15087..8d27c143b 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -1107,7 +1107,9 @@ public class DialpadFragment extends Fragment } public void clearDialpad() { - mDigits.getText().clear(); + if (mDigits != null) { + mDigits.getText().clear(); + } } private void handleDialButtonClickWithEmptyDigits() { |