Treating Result.ERROR the same as Result.NOT_FOUND
When loading a contact, we could encounter an
error (especially when it's a GAL contact). Should
deal with that gracefully. For now - just won't
display anything.
Change-Id: I1dc714ea2b7d7b41d53cc986c2b7a2fbd94eca89
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/views/detail/ContactDetailFragment.java
index 5e8ab8c..8dbb3fd 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/views/detail/ContactDetailFragment.java
@@ -1170,7 +1170,7 @@
@Override
public void onLoadFinished(Loader<ContactLoader.Result> loader, ContactLoader.Result data) {
- if (data == ContactLoader.Result.NOT_FOUND) {
+ if (data == ContactLoader.Result.NOT_FOUND || data == ContactLoader.Result.ERROR) {
// Item has been deleted
Log.i(TAG, "No contact found. Closing activity");
if (mListener != null) mListener.onContactNotFound();
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index e0acf44..f19feb3 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -1513,7 +1513,7 @@
public void onLoadFinished(Loader<ContactLoader.Result> loader, ContactLoader.Result data) {
final long loaderCurrentTime = SystemClock.elapsedRealtime();
Log.v(TAG, "Time needed for loading: " + (loaderCurrentTime-mLoaderStartTime));
- if (data == ContactLoader.Result.NOT_FOUND) {
+ if (data == ContactLoader.Result.NOT_FOUND || data == ContactLoader.Result.ERROR) {
// Item has been deleted
Log.i(TAG, "No contact found. Closing activity");
if (mListener != null) mListener.onContactNotFound();