summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohit Yengisetty <rohit@cyngn.com>2016-03-21 11:16:54 -0700
committerRohit Yengisetty <rohit@cyngn.com>2016-03-21 11:16:54 -0700
commit9791b6374855156403090c2b59c2268febe1c4b0 (patch)
tree8ee79b753b8d92d5b5c0127727a63fbff2c9d336
parenta33722b80c93bb7798ea93a58ce2c9469a8add6b (diff)
downloadpackages_apps_Contacts-9791b6374855156403090c2b59c2268febe1c4b0.tar.gz
packages_apps_Contacts-9791b6374855156403090c2b59c2268febe1c4b0.tar.bz2
packages_apps_Contacts-9791b6374855156403090c2b59c2268febe1c4b0.zip
Fix NPE in Contact Card
Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.contacts.common.util.BlockContactHelper.destroy()' on a null object reference at com.android.contacts.quickcontact.QuickContactActivity.finish(QuickContactActivity.java:2318) at com.android.contacts.quickcontact.QuickContactActivity.processIntent(QuickContactActivity.java:934) at com.android.contacts.quickcontact.QuickContactActivity.onCreate(QuickContactActivity.java:875) Change-Id: I624ca68971079e15b0b9370835533fc4a88e2448 Issue-Id: CYNGNOS-2272
-rw-r--r--src/com/android/contacts/quickcontact/QuickContactActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 99af33c36..65c4d3cf7 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2315,7 +2315,9 @@ public class QuickContactActivity extends ContactsActivity implements
// override transitions to skip the standard window animations
overridePendingTransition(0, 0);
- mBlockContactHelper.destroy();
+ if (mBlockContactHelper != null) {
+ mBlockContactHelper.destroy();
+ }
}
private final LoaderCallbacks<List<ContactInteraction>> mLoaderInteractionsCallbacks =