Merge "Removing diagnostics" into ub-launcher3-master
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1084e7a..ec3a966 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1383,11 +1383,6 @@
}
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 c38423a..5ab6eea 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -208,11 +208,6 @@
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 @@
* @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 @@
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 23c6faf..210f744 100644
--- a/src/com/android/launcher3/model/BaseLoaderResults.java
+++ b/src/com/android/launcher3/model/BaseLoaderResults.java
@@ -251,11 +251,6 @@
protected void bindWorkspaceItems(final ArrayList<ItemInfo> 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 4fe0c85..7275576 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -124,11 +124,6 @@
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 d8d9930..ac5076c 100644
--- a/src/com/android/launcher3/model/ModelWriter.java
+++ b/src/com/android/launcher3/model/ModelWriter.java
@@ -109,11 +109,6 @@
}
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 @@
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 f2a8da5..02f5502 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -216,11 +216,6 @@
}
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 @@
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 8b8e436..fbb4f51 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 @@
@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 @@
}
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 @@
@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 @@
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 @@
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