From a7da86e14abc2bed4edf77b426179e32935dcc8d Mon Sep 17 00:00:00 2001
From: Vadim Tryshev <vadimt@google.com>
Date: Fri, 5 Oct 2018 20:03:57 -0700
Subject: [PATCH] More temporary logging to diagnose
 testPendingWidget_autoRestored

And waiting to loader to finish to improve determinism.

Bug: 117332845
Test: running Launcher
Change-Id: Icdfce969b61f8ceb952a2715037783458da4d4c4
---
 src/com/android/launcher3/LauncherModel.java         |  5 +++++
 .../android/launcher3/ui/AbstractLauncherUiTest.java | 12 ++++++++++++
 .../android/launcher3/ui/widget/BindWidgetTest.java  | 10 ++++++++++
 3 files changed, 27 insertions(+)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 316e23fcd9..5424d97bf9 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -563,6 +563,11 @@ public class LauncherModel extends BroadcastReceiver
             synchronized (mLock) {
                 // Everything loaded bind the data.
                 mModelLoaded = true;
+                if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS
+                        && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {
+                    android.util.Log.d("b/117332845",
+                            android.util.Log.getStackTraceString(new Throwable()));
+                }
             }
         }
 
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index f820ff9822..00df4e76dc 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -298,6 +298,11 @@ public abstract class AbstractLauncherUiTest {
     }
 
     protected void resetLoaderState() {
+        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS
+                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {
+            android.util.Log.d("b/117332845",
+                    "START " + android.util.Log.getStackTraceString(new Throwable()));
+        }
         try {
             mMainThreadExecutor.execute(new Runnable() {
                 @Override
@@ -308,6 +313,13 @@ public abstract class AbstractLauncherUiTest {
         } catch (Throwable t) {
             throw new IllegalArgumentException(t);
         }
+        waitForLauncherCondition(launcher ->
+                LauncherAppState.getInstance(mTargetContext).getModel().isModelLoaded());
+        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS
+                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {
+            android.util.Log.d("b/117332845",
+                    "FINISH " + android.util.Log.getStackTraceString(new Throwable()));
+        }
     }
 
     /**
diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
index a00b035642..c1dc43bf82 100644
--- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java
@@ -84,6 +84,11 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
     @Override
     @Before
     public void setUp() throws Exception {
+        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS
+                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {
+            android.util.Log.d("b/117332845",
+                    android.util.Log.getStackTraceString(new Throwable()));
+        }
         super.setUp();
 
         mResolver = mTargetContext.getContentResolver();
@@ -105,6 +110,11 @@ public class BindWidgetTest extends AbstractLauncherUiTest {
         }
 
         super.tearDown();
+        if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS
+                && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) {
+            android.util.Log.d("b/117332845",
+                    android.util.Log.getStackTraceString(new Throwable()));
+        }
     }
 
     @Test