summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-08-16 08:25:56 -0700
committerKeith Mok <kmok@cyngn.com>2016-08-16 08:25:56 -0700
commit60a394e091bea89416f8cb89047385df7da9f4d4 (patch)
tree3ed72546ff1353579b04a8b06c6f8997f1056e76
parentec49830c81ffbf29c7c6f8fe2818fefa416cc933 (diff)
downloadpackages_apps_ContactsCommon-60a394e091bea89416f8cb89047385df7da9f4d4.tar.gz
packages_apps_ContactsCommon-60a394e091bea89416f8cb89047385df7da9f4d4.tar.bz2
packages_apps_ContactsCommon-60a394e091bea89416f8cb89047385df7da9f4d4.zip
Fix crash when block incoming call without caller ID
If caller phone number is empty, finish will be called directly in onCreate without mBlockContactHelper being created. Causing null object refernece in onDestory function. Add a null checking to guard that. CYNGNOS-3262 HAM-1455 Change-Id: I4e73fc52c815feec723e5b56ffee06375619a109
-rw-r--r--src/com/android/contacts/common/activity/BlockContactActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/activity/BlockContactActivity.java b/src/com/android/contacts/common/activity/BlockContactActivity.java
index 9fd1b424..0abf6cbd 100644
--- a/src/com/android/contacts/common/activity/BlockContactActivity.java
+++ b/src/com/android/contacts/common/activity/BlockContactActivity.java
@@ -79,6 +79,8 @@ public class BlockContactActivity extends Activity implements BlockContactDialog
@Override
protected void onDestroy() {
super.onDestroy();
- mBlockContactHelper.destroy();
+ if (mBlockContactHelper != null) {
+ mBlockContactHelper.destroy();
+ }
}
}