commit d121059a49b2a771bb5c25f7dc8fa6ab45242a92
author Yorke Lee <yorkelee@google.com> Fri Aug 09 22:28:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 09 22:28:03 2013 +0000
tree ea7b981ebb79c9b0b1e701ec6ac8ee5d9d91bcf0
parent a53c9ced8f3f6854bb1d359ec3d8f3cbc72fe2e7
parent bddd6fb09fb0bbf7787e600b3b4c044482a94d61

Merge "Make sure to not call getTelephonyManager with null context" into klp-dev

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 e113374..f3a1e99 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -1663,6 +1663,10 @@
                             // TODO: Filter out emergency numbers if
                             // the carrier does not want redial for
                             // these.
+                            // If the fragment has already been detached since the last time
+                            // we called queryLastOutgoingCall in onResume there is no point
+                            // doing anything here.
+                            if (getActivity() == null) return;
                             mLastNumberDialed = number;
                             updateDialAndDeleteButtonEnabledState();
                         }