Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev

am: e60b8f8

* commit 'e60b8f897065a9600058a7b958f1e0bcd198b0b5':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba

core/java/android/app/LoaderManager.java

@@ -318,7 +318,7 @@ class LoaderManagerImpl extends LoaderManager {
             if (mStarted) {
                 if (mReportNextStart) {
                     mReportNextStart = false;
-                    if (mHaveData) {
+                    if (mHaveData && !mRetaining) {
                         callOnLoadFinished(mLoader, mData);
                     }
                 }