summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-12-21 13:25:28 +0100
committerAndreas Schneider <asn@cryptomilk.org>2011-12-21 13:29:37 +0100
commit3a7ffd3b45e9b108ee0e2f984b43af43a9d4e534 (patch)
tree69c7521fb3f24cb71e84639c0d8c51fed72de88b
parent66414dd515c6dfc08f3e9e6a722bfeaf99f3023f (diff)
downloadandroid_packages_apps_Contacts-3a7ffd3b45e9b108ee0e2f984b43af43a9d4e534.tar.gz
android_packages_apps_Contacts-3a7ffd3b45e9b108ee0e2f984b43af43a9d4e534.tar.bz2
android_packages_apps_Contacts-3a7ffd3b45e9b108ee0e2f984b43af43a9d4e534.zip
Fix a possible null pointer exeption editing a contact.
Change-Id: I4c6fb8f6f5c72ae4b286514e4a1dfd8a6bb66632 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/com/android/contacts/ui/EditContactActivity.java2
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) {