Merge "Log SizeCompatRestartButtonEventReported atom." into sc-v2-dev (73fbff2c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+30 −2

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.app.ActivityManager.RunningTaskInfo;
		import android.app.TaskInfo;
		import android.content.Context;
		import android.content.LocusId;
		import android.content.pm.ActivityInfo;
		import android.graphics.Rect;
		import android.os.Binder;
		import android.os.IBinder;
		@@ -46,6 +47,7 @@ import android.window.TaskOrganizer;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.protolog.common.ProtoLog;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.wm.shell.common.ScreenshotUtils;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.sizecompatui.SizeCompatUIController;
		@@ -487,15 +489,41 @@ public class ShellTaskOrganizer extends TaskOrganizer implements
		}
		}

		@Override
		public void onSizeCompatRestartButtonAppeared(int taskId) {
		final TaskAppearedInfo info;
		synchronized (mLock) {
		info = mTasks.get(taskId);
		}
		if (info == null) {
		return;
		}
		logSizeCompatRestartButtonEventReported(info,
		FrameworkStatsLog.SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED__EVENT__APPEARED);
		}

		@Override
		public void onSizeCompatRestartButtonClicked(int taskId) {
		final TaskAppearedInfo info;
		synchronized (mLock) {
		info = mTasks.get(taskId);
		}
		if (info != null) {
		if (info == null) {
		return;
		}
		logSizeCompatRestartButtonEventReported(info,
		FrameworkStatsLog.SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED__EVENT__CLICKED);
		restartTaskTopActivityProcessIfVisible(info.getTaskInfo().token);
		}

		private void logSizeCompatRestartButtonEventReported(@NonNull TaskAppearedInfo info,
		int event) {
		ActivityInfo topActivityInfo = info.getTaskInfo().topActivityInfo;
		if (topActivityInfo == null) {
		return;
		}
		FrameworkStatsLog.write(FrameworkStatsLog.SIZE_COMPAT_RESTART_BUTTON_EVENT_REPORTED,
		topActivityInfo.applicationInfo.uid, event);
		}

		/**

libs/WindowManager/Shell/src/com/android/wm/shell/sizecompatui/SizeCompatUIController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ public class SizeCompatUIController implements DisplayController.OnDisplaysChang

		/** Callback for size compat UI interaction. */
		public interface SizeCompatUICallback {
		/** Called when the size compat restart button appears. */
		void onSizeCompatRestartButtonAppeared(int taskId);
		/** Called when the size compat restart button is clicked. */
		void onSizeCompatRestartButtonClicked(int taskId);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/sizecompatui/SizeCompatUILayout.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,8 @@ class SizeCompatUILayout {
		mShouldShowHint = false;
		createSizeCompatHint();
		}

		mCallback.onSizeCompatRestartButtonAppeared(mTaskId);
		}

		/** Creates the restart button hint window. */