commit 2776c7fe8117773fdf773396f61ed047238470f9
author Jean-Baptiste Queru <jbq@google.com> Tue Jul 13 13:44:05 2010 -0700
committer Jean-Baptiste Queru <jbq@google.com> Tue Jul 13 13:50:20 2010 -0700
tree c7e68fc1c3c847fe6ead92d04d285aa9cbb79441
parent 58c066fa5c947fe8c17b17132edacfa421269466
parent 53bf1c10e4de51a5b3ab5c271a81315e52fc1dfc

Resolve merge conflicts

Change-Id: I2d6c1adf2d4cdc1eb1329f5e78cdf5c6f3195aeb

src/com/android/contacts/views/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 7418e8b..acde05c 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -1017,6 +1017,9 @@
 
             int value;
             if (!skipAccountTypeCheck) {
+                if (oneSource.accountType == null) {
+                    return 1;
+                }
                 value = oneSource.accountType.compareTo(twoSource.accountType);
                 if (value != 0) {
                     return value;
@@ -1360,4 +1363,4 @@
     public Uri getUri() {
         return mUri;
     }
-}
\ No newline at end of file
+}