commit 63db02b73152b6d164066d5b7aee977cfbb869c2
author Daniel Lehmann <lehmannd@google.com> Wed Aug 04 09:27:07 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 04 09:27:07 2010 -0700
tree 1ee3bd03520f660d1124d37a96dc17f30ad12fbf
parent d178af428c7c7d0dc6cdc1d5ed38aa6fd92cf459
parent d02cdeec0040c756e488a2251fae2a5908051410

am d02cdeec: Fix NPE: Dial-Button pushed while a non-actionable item is selected Bug:2887049

Merge commit 'd02cdeec0040c756e488a2251fae2a5908051410' into gingerbread-plus-aosp

* commit 'd02cdeec0040c756e488a2251fae2a5908051410':
  Fix NPE: Dial-Button pushed while a non-actionable item is selected

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index ead6a4a..a4a0892 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -782,7 +782,7 @@
                 int index = mListView.getSelectedItemPosition();
                 if (index != -1) {
                     ViewEntry entry = ViewAdapter.getEntry(mSections, index, SHOW_SEPARATORS);
-                    if (entry != null &&
+                    if (entry != null && entry.intent != null &&
                             entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
                         startActivity(entry.intent);
                         return true;