commit 13005b7d9b68edab07e799184a419aef1705e5e6
author Daisuke Miyakawa <dmiyakawa@google.com> Mon Aug 15 12:36:26 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 15 12:36:26 2011 -0700
tree d3055289007e363aeebb5c21b37070449b38abcb
parent 3960bdbf815052474172cee21476566e71af53a0
parent b200a2a49a53bef09dbf0125f6b02f74b408b6b7

Merge "Fix possible NPE on showDialpadChooser()"

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

diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java
index 377a595..62ba95e 100644
--- a/src/com/android/contacts/dialpad/DialpadFragment.java
+++ b/src/com/android/contacts/dialpad/DialpadFragment.java
@@ -906,6 +906,11 @@
      *                of the regular Dialer UI
      */
     private void showDialpadChooser(boolean enabled) {
+        // Check if onCreateView() is already called by checking one of View objects.
+        if (mDigits == null) {
+            return;
+        }
+
         if (enabled) {
             // Log.i(TAG, "Showing dialpad chooser!");
             mDigits.setVisibility(View.GONE);