diff options
| author | Keith Mok <kmok@cyngn.com> | 2016-08-16 08:25:56 -0700 |
|---|---|---|
| committer | Keith Mok <kmok@cyngn.com> | 2016-08-31 09:05:03 -0700 |
| commit | 34d7f50a9d03a57469888048ed1a86ca20f92470 (patch) | |
| tree | 4dc2658ec24c372bc57424f5f7ffa4cd0708add9 | |
| parent | 813b161a639ba9bf7ddc901191b7134eb4521cbe (diff) | |
| download | android_packages_apps_ContactsCommon-34d7f50a9d03a57469888048ed1a86ca20f92470.tar.gz android_packages_apps_ContactsCommon-34d7f50a9d03a57469888048ed1a86ca20f92470.tar.bz2 android_packages_apps_ContactsCommon-34d7f50a9d03a57469888048ed1a86ca20f92470.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
(cherry picked from commit 60a394e091bea89416f8cb89047385df7da9f4d4)
| -rw-r--r-- | src/com/android/contacts/common/activity/BlockContactActivity.java | 4 |
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(); + } } } |