From 3f8591f00325dcc9ded0b49c998f454d060a09c2 Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 25 Jan 2019 10:35:53 -0800 Subject: [PATCH] Removing diagnostics Now that b/117332845 is fixed Bug: 117332845 Change-Id: If8c137b9c7cc386dfc5b5af4b81a3efbfa33f770 Tests: None --- src/com/android/launcher3/Launcher.java | 5 ---- src/com/android/launcher3/LauncherModel.java | 15 ---------- .../launcher3/model/BaseLoaderResults.java | 5 ---- .../android/launcher3/model/LoaderTask.java | 5 ---- .../android/launcher3/model/ModelWriter.java | 10 ------- .../launcher3/ui/AbstractLauncherUiTest.java | 10 ------- .../launcher3/ui/widget/BindWidgetTest.java | 30 ------------------- 7 files changed, 80 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b8b1181dd6..16909f005f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1383,11 +1383,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, } private void setWorkspaceLoading(boolean value) { - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", "setWorkspaceLoading " + value + " @ " + - android.util.Log.getStackTraceString(new Throwable())); - } mWorkspaceLoading = value; } diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ebca2eaf45..619d3ae79c 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -208,11 +208,6 @@ public class LauncherModel extends BroadcastReceiver static void checkItemInfoLocked( final int itemId, final ItemInfo item, StackTraceElement[] stackTrace) { - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Checking item: " + android.util.Log.getStackTraceString(new Throwable())); - } ItemInfo modelItem = sBgDataModel.itemsIdMap.get(itemId); if (modelItem != null && item != modelItem) { // check all the data is consistent @@ -408,11 +403,6 @@ public class LauncherModel extends BroadcastReceiver * @return true if the page could be bound synchronously. */ public boolean startLoader(int synchronousBindPage) { - 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())); - } // Enable queue before starting loader. It will get disabled in Launcher#finishBindingItems InstallShortcutReceiver.enableInstallQueue(InstallShortcutReceiver.FLAG_LOADER_RUNNING); synchronized (mLock) { @@ -512,11 +502,6 @@ 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/src/com/android/launcher3/model/BaseLoaderResults.java b/src/com/android/launcher3/model/BaseLoaderResults.java index 23c6faf548..210f744492 100644 --- a/src/com/android/launcher3/model/BaseLoaderResults.java +++ b/src/com/android/launcher3/model/BaseLoaderResults.java @@ -251,11 +251,6 @@ public abstract class BaseLoaderResults { protected void bindWorkspaceItems(final ArrayList workspaceItems, final Executor executor) { - - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - Log.d("b/117332845", Log.getStackTraceString(new Throwable())); - } // Bind the workspace items int N = workspaceItems.size(); for (int i = 0; i < N; i += ITEMS_CHUNK) { diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index cfabc10994..f1de37db8c 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -126,11 +126,6 @@ public class LoaderTask implements Runnable { mPackageInstaller = PackageInstallerCompat.getInstance(mApp.getContext()); mAppWidgetManager = AppWidgetManagerCompat.getInstance(mApp.getContext()); mIconCache = mApp.getIconCache(); - 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())); - } } protected synchronized void waitForIdle() { diff --git a/src/com/android/launcher3/model/ModelWriter.java b/src/com/android/launcher3/model/ModelWriter.java index d8d99308e2..ac5076c11b 100644 --- a/src/com/android/launcher3/model/ModelWriter.java +++ b/src/com/android/launcher3/model/ModelWriter.java @@ -109,11 +109,6 @@ public class ModelWriter { } private void checkItemInfoLocked(int itemId, ItemInfo item, StackTraceElement[] stackTrace) { - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Checking item: " + android.util.Log.getStackTraceString(new Throwable())); - } ItemInfo modelItem = mBgDataModel.itemsIdMap.get(itemId); if (modelItem != null && item != modelItem) { // check all the data is consistent @@ -363,11 +358,6 @@ public class ModelWriter { private final int mItemId; UpdateItemRunnable(ItemInfo item, ContentWriter writer) { - 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())); - } mItem = item; mWriter = writer; mItemId = item.id; diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 1b345982f7..5b222f829d 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -216,11 +216,6 @@ 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 @@ -232,11 +227,6 @@ public abstract class AbstractLauncherUiTest { throw new IllegalArgumentException(t); } waitForModelLoaded(); - 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())); - } } protected void waitForModelLoaded() { diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index 8b8e43626c..fbb4f5115b 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -84,11 +84,6 @@ 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(); @@ -110,11 +105,6 @@ 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 @@ -157,10 +147,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest { @Test public void testPendingWidget_autoRestored() { - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Test Started @ " + android.util.Log.getStackTraceString(new Throwable())); - } // A non-restored widget with no config screen gets restored automatically. LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, false); @@ -170,21 +156,10 @@ public class BindWidgetTest extends AbstractLauncherUiTest { setupContents(item); verifyWidgetPresent(info); - - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Test Ended @ " + android.util.Log.getStackTraceString(new Throwable())); - } } @Test public void testPendingWidget_withConfigScreen() { - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Test Started @ " + android.util.Log.getStackTraceString(new Throwable())); - } // A non-restored widget with config screen get bound and shows a 'Click to setup' UI. LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(this, true); @@ -206,11 +181,6 @@ public class BindWidgetTest extends AbstractLauncherUiTest { assertNotNull(AppWidgetManager.getInstance(mTargetContext) .getAppWidgetInfo(mCursor.getInt(mCursor.getColumnIndex( LauncherSettings.Favorites.APPWIDGET_ID)))); - if (com.android.launcher3.Utilities.IS_RUNNING_IN_TEST_HARNESS - && com.android.launcher3.Utilities.IS_DEBUG_DEVICE) { - android.util.Log.d("b/117332845", - "Test Ended @ " + android.util.Log.getStackTraceString(new Throwable())); - } } @Test @Ignore