Merge "Removing diagnostics" into ub-launcher3-master (3663b314) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}

src/com/android/launcher3/LauncherModel.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -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()));
		}
		}
		}

src/com/android/launcher3/model/BaseLoaderResults.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -251,11 +251,6 @@ public abstract class BaseLoaderResults {

		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) {

src/com/android/launcher3/model/LoaderTask.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -124,11 +124,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() {

src/com/android/launcher3/model/ModelWriter.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -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;