diff options
| author | Walter Jang <wjang@google.com> | 2016-02-29 11:46:03 -0800 |
|---|---|---|
| committer | Walter Jang <wjang@google.com> | 2016-02-29 21:36:58 +0000 |
| commit | 1bb6c29245bbef5b8dd1c68607acf14aec639be6 (patch) | |
| tree | fef821d8875d3d4710ac1b564b8ec94a31b26784 /src/com/android | |
| parent | 6b77ccf09eae9168eca1bac61a6256a4a703649f (diff) | |
| download | android_packages_apps_Contacts-1bb6c29245bbef5b8dd1c68607acf14aec639be6.tar.gz android_packages_apps_Contacts-1bb6c29245bbef5b8dd1c68607acf14aec639be6.tar.bz2 android_packages_apps_Contacts-1bb6c29245bbef5b8dd1c68607acf14aec639be6.zip | |
Check for null extras before accessing previous screen extra
Bug 27389760
Bug 27341012
Bug 18388581
Change-Id: Ic1b4a98aa3d94c2fa29e25e9d3067affeee0cf21
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 7897782a8..2617abe97 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -924,8 +924,8 @@ public class QuickContactActivity extends ContactsActivity return; } - final int previousScreenType = getIntent().getExtras() - .getInt(EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.UNKNOWN); + final int previousScreenType = getIntent().getIntExtra + (EXTRA_PREVIOUS_SCREEN_TYPE, ScreenType.UNKNOWN); Logger.logScreenView(this, ScreenType.QUICK_CONTACT, previousScreenType); if (CompatUtils.isLollipopCompatible()) { |