diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-12-31 00:39:24 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2011-12-31 00:39:24 +0300 |
| commit | 3832f7f4bbb03fcaa6ae3fac0a17648337151b68 (patch) | |
| tree | c20667c4e1ad8d88a2c37f088ff7ce769a82b82b | |
| parent | e8ed178c895c558a7dd6ebd06b9681f1badc5b7a (diff) | |
| parent | 3a7ffd3b45e9b108ee0e2f984b43af43a9d4e534 (diff) | |
| download | android_packages_apps_Contacts-3832f7f4bbb03fcaa6ae3fac0a17648337151b68.tar.gz android_packages_apps_Contacts-3832f7f4bbb03fcaa6ae3fac0a17648337151b68.tar.bz2 android_packages_apps_Contacts-3832f7f4bbb03fcaa6ae3fac0a17648337151b68.zip | |
Merge "Fix a possible null pointer exeption editing a contact." into gingerbread
| -rw-r--r-- | src/com/android/contacts/ui/EditContactActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java index 4c9d92092..a604e7306 100644 --- a/src/com/android/contacts/ui/EditContactActivity.java +++ b/src/com/android/contacts/ui/EditContactActivity.java @@ -1397,6 +1397,8 @@ public final class EditContactActivity extends Activity if (!skipAccountTypeCheck) { if (oneSource.accountType == null) { return 1; + } else if (twoSource.accountType == null) { + return -1; } value = oneSource.accountType.compareTo(twoSource.accountType); if (value != 0) { |