Fixed log warning for calling doStart() twice.

Bug 36504927

The LoaderManager was performing a doStart() multiple times
and issued a warning and then returned without any problems.
This CL fixes the underlying problem of doStart() being
called multiple times so that the warning isn't logged.

Test: ran fragment cts tests
Change-Id: I4a43280fd581e08ccd911d8d05367e00382d694a

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index eff77b5..44fefd3 100644 (file)
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1670,8 +1670,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
             if (!mCheckedForLoaderManager) {
                 mCheckedForLoaderManager = true;
                 mLoaderManager = mHost.getLoaderManager(mWho, mLoadersStarted, false);
-            }
-            if (mLoaderManager != null) {
+            } else if (mLoaderManager != null) {
                 mLoaderManager.doStart();
             }
         }