summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-03 15:24:47 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-03 15:24:47 -0800
commit254d5c6c36f7c663c6442c799facfba1acdcaa60 (patch)
treed858c2bbb4e5c7cdc7eabe8da41ae4f4723cfa31
parent03f35a6ff15fa7fd613fa38dacb083830f1256f3 (diff)
parent25319a5f29dd83297bbf94c94b8d7953ee0b64cf (diff)
downloadpackages_apps_Contacts-254d5c6c36f7c663c6442c799facfba1acdcaa60.tar.gz
packages_apps_Contacts-254d5c6c36f7c663c6442c799facfba1acdcaa60.tar.bz2
packages_apps_Contacts-254d5c6c36f7c663c6442c799facfba1acdcaa60.zip
Merge "Contacts: Error when try to edit user profile"
-rw-r--r--src/com/android/contacts/editor/ContactEditorFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 840a3d040..72f4ef5c6 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -73,6 +73,7 @@ import com.android.contacts.R;
import com.android.contacts.RcsApiManager;
import com.android.contacts.activities.ContactEditorAccountsChangedActivity;
import com.android.contacts.activities.ContactEditorActivity;
+import com.android.contacts.common.SimContactsConstants;
import com.android.contacts.common.model.AccountTypeManager;
import com.android.contacts.common.model.ValuesDelta;
import com.android.contacts.common.model.account.AccountType;
@@ -616,7 +617,8 @@ public class ContactEditorFragment extends Fragment implements
// For profile contacts, we need a different query URI
state.setProfileQueryUri();
// Try to find a local profile contact
- if (state.getValues().getAsString(RawContacts.ACCOUNT_TYPE) == null) {
+ if (SimContactsConstants.ACCOUNT_TYPE_PHONE.equals(state.getValues()
+ .getAsString(RawContacts.ACCOUNT_TYPE))) {
localProfileExists = true;
}
}