summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/DialtactsActivity.java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-15 10:52:27 -0700
committerYorke Lee <yorkelee@google.com>2015-05-15 10:52:27 -0700
commit791b488fb8f835bb7976cb1f839a0b3ccf04132c (patch)
treef36fa8694396077f5f02a994e821c30bfa86ee3d /src/com/android/dialer/DialtactsActivity.java
parenta812d28bfdac171e726d6b865e7ea5cfda24d924 (diff)
downloadandroid_packages_apps_Dialer-791b488fb8f835bb7976cb1f839a0b3ccf04132c.tar.gz
android_packages_apps_Dialer-791b488fb8f835bb7976cb1f839a0b3ccf04132c.tar.bz2
android_packages_apps_Dialer-791b488fb8f835bb7976cb1f839a0b3ccf04132c.zip
Fix potential Dialer NPEs
Fix NPEs encountered during monkey tests Bug: 21167534 Change-Id: I98b6f675adfd233d3583c363f7daeca1bc14d8b7
Diffstat (limited to 'src/com/android/dialer/DialtactsActivity.java')
-rw-r--r--src/com/android/dialer/DialtactsActivity.java2
1 files changed, 1 insertions, 1 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) {