Merge "Reduce launcher logs in bugreports" into ub-launcher3-rvc-dev (4aef7423) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.app.prediction.AppPredictor;
		import android.app.prediction.AppTarget;
		import android.content.ComponentName;
		import android.content.Context;
		import android.os.Process;

		import androidx.annotation.NonNull;

		@@ -35,6 +36,7 @@ import com.android.launcher3.LauncherState;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.allapps.AllAppsContainerView;
		import com.android.launcher3.allapps.AllAppsStore.OnUpdateListener;
		import com.android.launcher3.hybridhotseat.HotseatFileLog;
		import com.android.launcher3.hybridhotseat.HotseatPredictionController;
		import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;
		import com.android.launcher3.model.data.ItemInfo;
		@@ -310,6 +312,18 @@ public class PredictionUiStateManager implements StateListener<LauncherState>,
		*/
		public static void fillInPredictedRank(
		@NonNull ItemInfo itemInfo, @NonNull LauncherLogProto.Target target) {

		HotseatFileLog hotseatFileLog = HotseatFileLog.INSTANCE.getNoCreate();

		if (hotseatFileLog != null && itemInfo != null && Utilities.IS_DEBUG_DEVICE) {
		final String pkg = itemInfo.getTargetComponent() != null
		? itemInfo.getTargetComponent().getPackageName() : "unknown";
		hotseatFileLog.log("UserEvent",
		"appLaunch: packageName:" + pkg + ",isWorkApp:" + (itemInfo.user != null
		&& !Process.myUserHandle().equals(itemInfo.user))
		+ ",launchLocation:" + itemInfo.container);
		}

		final PredictionUiStateManager manager = PredictionUiStateManager.INSTANCE.getNoCreate();
		if (manager == null \|\| itemInfo.getTargetComponent() == null \|\| itemInfo.user == null
		\|\| (itemInfo.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatFileLog.java

0 → 100644

+129 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.launcher3.hybridhotseat;

		import android.content.Context;
		import android.os.Handler;
		import android.util.Log;

		import com.android.launcher3.logging.FileLog;
		import com.android.launcher3.util.Executors;
		import com.android.launcher3.util.MainThreadInitializedObject;

		import java.io.File;
		import java.io.FileWriter;
		import java.io.PrintWriter;
		import java.text.DateFormat;
		import java.util.Calendar;
		import java.util.Date;

		/**
		* Helper class to allow hot seat file logging
		*/
		public class HotseatFileLog {

		public static final int LOG_DAYS = 10;
		private static final String FILE_NAME_PREFIX = "hotseat-log-";
		private static final DateFormat DATE_FORMAT =
		DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
		public static final MainThreadInitializedObject<HotseatFileLog> INSTANCE =
		new MainThreadInitializedObject<>(HotseatFileLog::new);


		private final Handler mHandler = new Handler(
		Executors.createAndStartNewLooper("hotseat-logger"));
		private final File mLogsDir;
		private PrintWriter mCurrentWriter;
		private String mFileName;

		private HotseatFileLog(Context context) {
		mLogsDir = context.getFilesDir();
		}

		/**
		* Prints log values to disk
		*/
		public void log(String tag, String msg) {
		String out = String.format("%s %s %s", DATE_FORMAT.format(new Date()), tag, msg);

		mHandler.post(() -> {
		synchronized (this) {
		PrintWriter writer = getWriter();
		if (writer != null) {
		writer.println(out);
		}
		}
		});
		}

		private PrintWriter getWriter() {
		String fName = FILE_NAME_PREFIX + (LOG_DAYS % 10);
		if (fName.equals(mFileName)) return mCurrentWriter;

		Calendar cal = Calendar.getInstance();

		boolean append = false;
		File logFile = new File(mLogsDir, fName);
		if (logFile.exists()) {
		Calendar modifiedTime = Calendar.getInstance();
		modifiedTime.setTimeInMillis(logFile.lastModified());

		// If the file was modified more that 36 hours ago, purge the file.
		// We use instead of 24 to account for day-365 followed by day-1
		modifiedTime.add(Calendar.HOUR, 36);
		append = cal.before(modifiedTime);
		}


		if (mCurrentWriter != null) {
		mCurrentWriter.close();
		}
		try {
		mCurrentWriter = new PrintWriter(new FileWriter(logFile, append));
		mFileName = fName;
		} catch (Exception ex) {
		Log.e("HotseatLogs", "Error writing logs to file", ex);
		closeWriter();
		}
		return mCurrentWriter;
		}


		private synchronized void closeWriter() {
		mFileName = null;
		if (mCurrentWriter != null) {
		mCurrentWriter.close();
		}
		mCurrentWriter = null;
		}


		/**
		* Returns a list of all log files
		*/
		public synchronized File[] getLogFiles() {
		File[] files = new File[LOG_DAYS + FileLog.LOG_DAYS];
		//include file log files here
		System.arraycopy(FileLog.getLogFiles(), 0, files, 0, FileLog.LOG_DAYS);

		closeWriter();
		for (int i = 0; i < LOG_DAYS; i++) {
		files[FileLog.LOG_DAYS + i] = new File(mLogsDir, FILE_NAME_PREFIX + i);
		}
		return files;
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ import com.android.launcher3.appprediction.DynamicItemCache;
		import com.android.launcher3.dragndrop.DragController;
		import com.android.launcher3.dragndrop.DragOptions;
		import com.android.launcher3.icons.IconCache;
		import com.android.launcher3.logging.FileLog;
		import com.android.launcher3.model.data.AppInfo;
		import com.android.launcher3.model.data.FolderInfo;
		import com.android.launcher3.model.data.ItemInfo;
		@@ -382,7 +381,9 @@ public class HotseatPredictionController implements DragController.DragListener,
		mComponentKeyMappers.add(new ComponentKeyMapper(key, mDynamicItemCache));
		}
		predictionLog.append("]");
		if (Utilities.IS_DEBUG_DEVICE) FileLog.d(TAG, predictionLog.toString());
		if (Utilities.IS_DEBUG_DEVICE) {
		HotseatFileLog.INSTANCE.get(mLauncher).log(TAG, predictionLog.toString());
		}
		updateDependencies();
		fillGapsWithPrediction();
		cachePredictionComponentKeysIfNecessary(componentKeys);

src/com/android/launcher3/logging/UserEventDispatcher.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import androidx.annotation.Nullable;
		import com.android.launcher3.DropTarget;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.userevent.LauncherLogProto;
		@@ -143,14 +142,6 @@ public class UserEventDispatcher implements ResourceBasedOverride {
		fillIntentInfo(itemTarget, intent, userHandle);
		}
		LauncherEvent event = newLauncherEvent(action, targets);
		ItemInfo info = v == null ? null : (ItemInfo) v.getTag();
		if (info != null && Utilities.IS_DEBUG_DEVICE && FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {
		final String pkg = info.getTargetComponent() != null
		? info.getTargetComponent().getPackageName() : "unknown";
		FileLog.d(TAG, "appLaunch: packageName:" + pkg
		+ ",isWorkApp:" + (info.user != null && !Process.myUserHandle().equals(
		userHandle)) + ",launchLocation:" + info.container);
		}
		dispatchUserEvent(event, intent);
		mAppOrTaskLaunch = true;
		}