Don't override user-changes if the record changes in the background
Change-Id: I565a6dd6de2cf43ae97c27606fab709113873cc9
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 5951f7f..3ed9473 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -220,6 +220,13 @@
}
public void setData(ContactLoader.Result data) {
+ // If we have already loaded data, we do not want to change it here to not confuse the user
+ if (mState != null) {
+ Log.v(TAG, "Ignoring background change. This will have to be rebased later");
+ return;
+ }
+
+
mState = EntityDeltaList.fromIterator(data.getEntities().iterator());
// TODO: Merge in Intent parameters can only be done on the first load.
// The behaviour for subsequent loads is probably broken, so fix this