Merge "Remove expensive logging." into sc-dev (2d6d8f89) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -32,13 +32,11 @@ import com.android.launcher3.model.BgDataModel.Callbacks;
		import com.android.launcher3.model.data.AppInfo;
		import com.android.launcher3.model.data.FolderInfo;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.ItemInfoWithIcon;
		import com.android.launcher3.model.data.LauncherAppWidgetInfo;
		import com.android.launcher3.model.data.WorkspaceItemInfo;
		import com.android.launcher3.pm.InstallSessionHelper;
		import com.android.launcher3.pm.PackageInstallInfo;
		import com.android.launcher3.util.GridOccupancy;
		import com.android.launcher3.util.IOUtils;
		import com.android.launcher3.util.IntArray;
		import com.android.launcher3.util.PackageManagerHelper;

		@@ -182,13 +180,6 @@ public class AddWorkspaceItemsTask extends BaseModelUpdateTask {

		// log bitmap and label
		FileLog.d(LOG, "Adding item info to workspace: " + itemInfo);
		if (itemInfo instanceof ItemInfoWithIcon) {
		ItemInfoWithIcon infoWithIcon = (ItemInfoWithIcon) itemInfo;

		FileLog.d(LOG, "Item info icon base 64 string: "
		+ infoWithIcon.bitmap.icon == null
		? "null" : IOUtils.toBase64String(infoWithIcon.bitmap.icon));
		}
		}
		}

src/com/android/launcher3/pm/InstallSessionHelper.java

+1 −28

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.content.pm.LauncherApps;
		import android.content.pm.PackageInstaller;
		import android.content.pm.PackageInstaller.SessionInfo;
		import android.content.pm.PackageManager;
		import android.graphics.Bitmap;
		import android.os.Build;
		import android.os.Process;
		import android.os.UserHandle;
		@@ -41,7 +40,6 @@ import com.android.launcher3.Utilities;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logging.FileLog;
		import com.android.launcher3.model.ItemInstallQueue;
		import com.android.launcher3.util.IOUtils;
		import com.android.launcher3.util.IntArray;
		import com.android.launcher3.util.IntSet;
		import com.android.launcher3.util.MainThreadInitializedObject;
		@@ -231,37 +229,12 @@ public class InstallSessionHelper {
		}

		public boolean verifySessionInfo(PackageInstaller.SessionInfo sessionInfo) {
		boolean validSessionInfo = verify(sessionInfo) != null
		return verify(sessionInfo) != null
		&& sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER
		&& sessionInfo.getAppIcon() != null
		&& !TextUtils.isEmpty(sessionInfo.getAppLabel())
		&& !new PackageManagerHelper(mAppContext).isAppInstalled(
		sessionInfo.getAppPackageName(), getUserHandle(sessionInfo));

		if (sessionInfo != null) {
		Bitmap appIcon = sessionInfo.getAppIcon();

		if (Utilities.IS_DEBUG_DEVICE) {
		FileLog.d(LOG, String.format(
		"Verifying session info. Valid: %b,"
		+ " Session verified: %b,"
		+ " Install reason valid: %b,"
		+ " App icon: %s,"
		+ " App label: %s,"
		+ " App installed: %b.",
		validSessionInfo,
		verify(sessionInfo) != null,
		sessionInfo.getInstallReason() == PackageManager.INSTALL_REASON_USER,
		appIcon == null ? "null" : IOUtils.toBase64String(appIcon),
		sessionInfo.getAppLabel(),
		new PackageManagerHelper(mAppContext).isAppInstalled(
		sessionInfo.getAppPackageName(), getUserHandle(sessionInfo))));
		}
		} else {
		FileLog.d(LOG, "Verifying session info failed: session info null.");
		}

		return validSessionInfo;
		}

		public InstallSessionTracker registerInstallTracker(InstallSessionTracker.Callback callback) {

src/com/android/launcher3/util/IOUtils.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -16,9 +16,7 @@

		package com.android.launcher3.util;

		import android.graphics.Bitmap;
		import android.os.FileUtils;
		import android.util.Base64;
		import android.util.Log;

		import com.android.launcher3.Utilities;
		@@ -52,12 +50,6 @@ public class IOUtils {
		return out.toByteArray();
		}

		public static String toBase64String(Bitmap bitmap) {
		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
		bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
		return Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT);
		}

		public static long copy(InputStream from, OutputStream to) throws IOException {
		if (Utilities.ATLEAST_Q) {
		return FileUtils.copy(from, to);