commit 53bf1c10e4de51a5b3ab5c271a81315e52fc1dfc
author The Android Open Source Project <initial-contribution@android.com> Tue Jul 13 13:08:14 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 13 13:08:14 2010 -0700
tree 703d85cce037cf36dc62b62cf63171bffdbd628d
parent ed0924c45329589b9573fc0fb370167c5f6f3602
parent a1db3705a619dfcd662afe85ba5762771824d89d

merge from open-source master

Change-Id: Id5362cf68443a80498499bb4c7b66bf0718bd419

src/com/android/contacts/ui/EditContactActivity.java

diff --git a/src/com/android/contacts/ui/EditContactActivity.java b/src/com/android/contacts/ui/EditContactActivity.java
index c70cff6..3e248ea 100644
--- a/src/com/android/contacts/ui/EditContactActivity.java
+++ b/src/com/android/contacts/ui/EditContactActivity.java
@@ -1370,6 +1370,9 @@
 
         int value;
         if (!skipAccountTypeCheck) {
+            if (oneSource.accountType == null) {
+                return 1;
+            }
             value = oneSource.accountType.compareTo(twoSource.accountType);
             if (value != 0) {
                 return value;