diff options
author | Yorke Lee <yorkelee@google.com> | 2015-05-15 20:35:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-15 20:35:16 +0000 |
commit | 4b77f94c3978b11e5534ea631a319dbcadbe7a5c (patch) | |
tree | bfac3bb3795231f33601e28e19b17e47507431f7 /src | |
parent | 23c11e2c460eaabf9f9fb482dde46a2872c74819 (diff) | |
parent | 609693ab4c3ab7475d0993c4a219868a81f6eed1 (diff) |
am 609693ab: am a319842d: am 4c9a8cf0: Merge "Fix potential Dialer NPEs" into mnc-dev
* commit '609693ab4c3ab7475d0993c4a219868a81f6eed1':
Fix potential Dialer NPEs
Diffstat (limited to 'src')
-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() { |