Merge "Call forceLoad() when loader is not started to load hi-res photo"
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index ad41f2c..90cd350 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1151,6 +1151,12 @@
destroyInteractionLoaders();
mContactLoader = (ContactLoader) getLoaderManager().restartLoader(
LOADER_CONTACT_ID, null, mLoaderContactCallbacks);
+ // mContactLoader may not be in the state of "started". If not, onContentChanged() will
+ // not call forceLoad(), so QuickContact will not get the newly updated hi-res
+ // photo. If this is the case, we call forceLoad explicitly. See b/25204200.
+ if (!mContactLoader.isStarted()) {
+ mContactLoader.forceLoad();
+ }
mCachedCp2DataCardModel = null;
}