Store original task width and height instead of scale (fe0a413a) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+38 −29

Original line number	Diff line number	Diff line
		@@ -2012,6 +2012,8 @@ public class ActivityManager {
		/** See {@link android.view.Surface.Rotation} */
		@Surface.Rotation
		private int mRotation;
		/** The size of the snapshot before scaling */
		private final Point mTaskSize;
		private final Rect mContentInsets;
		// Whether this snapshot is a down-sampled version of the full resolution, used mainly for
		// low-ram devices
		@@ -2020,7 +2022,6 @@ public class ActivityManager {
		// the task having a secure window or having previews disabled
		private final boolean mIsRealSnapshot;
		private final int mWindowingMode;
		private final float mScale;
		private final int mSystemUiVisibility;
		private final boolean mIsTranslucent;
		// Must be one of the named color spaces, otherwise, always use SRGB color space.
		@@ -2028,9 +2029,9 @@ public class ActivityManager {

		public TaskSnapshot(long id,
		@NonNull ComponentName topActivityComponent, GraphicBuffer snapshot,
		@NonNull ColorSpace colorSpace, int orientation, int rotation, Rect contentInsets,
		boolean isLowResolution, float scale, boolean isRealSnapshot, int windowingMode,
		int systemUiVisibility, boolean isTranslucent) {
		@NonNull ColorSpace colorSpace, int orientation, int rotation, Point taskSize,
		Rect contentInsets, boolean isLowResolution, boolean isRealSnapshot,
		int windowingMode, int systemUiVisibility, boolean isTranslucent) {
		mId = id;
		mTopActivityComponent = topActivityComponent;
		mSnapshot = snapshot;
		@@ -2038,9 +2039,9 @@ public class ActivityManager {
		? ColorSpace.get(ColorSpace.Named.SRGB) : colorSpace;
		mOrientation = orientation;
		mRotation = rotation;
		mTaskSize = new Point(taskSize);
		mContentInsets = new Rect(contentInsets);
		mIsLowResolution = isLowResolution;
		mScale = scale;
		mIsRealSnapshot = isRealSnapshot;
		mWindowingMode = windowingMode;
		mSystemUiVisibility = systemUiVisibility;
		@@ -2057,9 +2058,9 @@ public class ActivityManager {
		: ColorSpace.get(ColorSpace.Named.SRGB);
		mOrientation = source.readInt();
		mRotation = source.readInt();
		mTaskSize = source.readParcelable(null /* classLoader */);
		mContentInsets = source.readParcelable(null /* classLoader */);
		mIsLowResolution = source.readBoolean();
		mScale = source.readFloat();
		mIsRealSnapshot = source.readBoolean();
		mWindowingMode = source.readInt();
		mSystemUiVisibility = source.readInt();
		@@ -2110,6 +2111,14 @@ public class ActivityManager {
		return mRotation;
		}

		/**
		* @return The size of the task at the point this snapshot was taken.
		*/
		@UnsupportedAppUsage
		public Point getTaskSize() {
		return mTaskSize;
		}

		/**
		* @return The system/content insets on the snapshot. These can be clipped off in order to
		* remove any areas behind system bars in the snapshot.
		@@ -2159,14 +2168,6 @@ public class ActivityManager {
		return mSystemUiVisibility;
		}

		/**
		* @return The scale this snapshot was taken in.
		*/
		@UnsupportedAppUsage
		public float getScale() {
		return mScale;
		}

		@Override
		public int describeContents() {
		return 0;
		@@ -2180,9 +2181,9 @@ public class ActivityManager {
		dest.writeInt(mColorSpace.getId());
		dest.writeInt(mOrientation);
		dest.writeInt(mRotation);
		dest.writeParcelable(mTaskSize, 0);
		dest.writeParcelable(mContentInsets, 0);
		dest.writeBoolean(mIsLowResolution);
		dest.writeFloat(mScale);
		dest.writeBoolean(mIsRealSnapshot);
		dest.writeInt(mWindowingMode);
		dest.writeInt(mSystemUiVisibility);
		@@ -2200,9 +2201,11 @@ public class ActivityManager {
		+ " mColorSpace=" + mColorSpace.toString()
		+ " mOrientation=" + mOrientation
		+ " mRotation=" + mRotation
		+ " mTaskSize=" + mTaskSize.toString()
		+ " mContentInsets=" + mContentInsets.toShortString()
		+ " mIsLowResolution=" + mIsLowResolution + " mScale=" + mScale
		+ " mIsRealSnapshot=" + mIsRealSnapshot + " mWindowingMode=" + mWindowingMode
		+ " mIsLowResolution=" + mIsLowResolution
		+ " mIsRealSnapshot=" + mIsRealSnapshot
		+ " mWindowingMode=" + mWindowingMode
		+ " mSystemUiVisibility=" + mSystemUiVisibility
		+ " mIsTranslucent=" + mIsTranslucent;
		}
		@@ -2224,9 +2227,9 @@ public class ActivityManager {
		private ColorSpace mColorSpace;
		private int mOrientation;
		private int mRotation;
		private Point mTaskSize;
		private Rect mContentInsets;
		private boolean mIsLowResolution;
		private float mScaleFraction;
		private boolean mIsRealSnapshot;
		private int mWindowingMode;
		private int mSystemUiVisibility;
		@@ -2263,25 +2266,31 @@ public class ActivityManager {
		return this;
		}

		/**
		* Sets the original size of the task
		*/
		public Builder setTaskSize(Point size) {
		mTaskSize = size;
		return this;
		}

		public Builder setContentInsets(Rect contentInsets) {
		mContentInsets = contentInsets;
		return this;
		}

		/**
		* Set to true if this is a low-resolution snapshot stored in *_reduced.jpg.
		* Returns {@code true} if this is meant to be a low-resolution
		*/
		public Builder setIsLowResolution(boolean isLowResolution) {
		mIsLowResolution = isLowResolution;
		return this;
		}

		public float getScaleFraction() {
		return mScaleFraction;
		public boolean isLowResolution() {
		return mIsLowResolution;
		}

		public Builder setScaleFraction(float scaleFraction) {
		mScaleFraction = scaleFraction;
		/**
		* Set to {@code true} if this is a low-resolution snapshot stored in *_reduced.jpg.
		*/
		public Builder setIsLowResolution(boolean isLowResolution) {
		mIsLowResolution = isLowResolution;
		return this;
		}

		@@ -2322,9 +2331,9 @@ public class ActivityManager {
		mColorSpace,
		mOrientation,
		mRotation,
		mTaskSize,
		mContentInsets,
		mIsLowResolution,
		mScaleFraction,
		mIsRealSnapshot,
		mWindowingMode,
		mSystemUiVisibility,

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/ThumbnailData.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,9 @@ public class ThumbnailData {
		orientation = snapshot.getOrientation();
		rotation = snapshot.getRotation();
		reducedResolution = snapshot.isLowResolution();
		scale = snapshot.getScale();
		// TODO(b/149579527): Pass task size instead of computing scale.
		// Assume width and height were scaled the same; compute scale only for width
		scale = (float) thumbnail.getWidth() / snapshot.getTaskSize().x;
		isRealSnapshot = snapshot.isRealSnapshot();
		isTranslucent = snapshot.isTranslucent();
		windowingMode = snapshot.getWindowingMode();

proto/src/task_snapshot.proto

+6 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,12 @@
		int32 system_ui_visibility = 8;
		bool is_translucent = 9;
		string top_activity_component = 10;
		float scale = 11;
		// deprecated because original width and height are stored now instead of the scale.
		float legacy_scale = 11 [deprecated=true];
		int64 id = 12;
		int32 rotation = 13;
		// The task width when the snapshot was taken
		int32 task_width = 14;
		// The task height when the snapshot was taken
		int32 task_height = 15;
		}

services/core/java/com/android/server/wm/TaskSnapshotController.java

+33 −35

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.content.pm.PackageManager;
		import android.graphics.Bitmap;
		import android.graphics.GraphicBuffer;
		import android.graphics.PixelFormat;
		import android.graphics.Point;
		import android.graphics.RecordingCanvas;
		import android.graphics.Rect;
		import android.graphics.RenderNode;
		@@ -89,14 +90,6 @@ class TaskSnapshotController {
		@VisibleForTesting
		static final int SNAPSHOT_MODE_NONE = 2;

		/**
		* Constant for <code>scaleFactor</code> when calling {@link #snapshotTask} which is
		* interpreted as using the most appropriate scale ratio for the system.
		* This may yield a smaller ratio on low memory devices.
		*/
		@VisibleForTesting
		static final float SNAPSHOT_SCALE_AUTO = -1f;

		private final WindowManagerService mService;

		private final TaskSnapshotCache mCache;
		@@ -273,8 +266,6 @@ class TaskSnapshotController {
		* information from the task and populates the builder.
		*
		* @param task the task to capture
		* @param scaleFraction the scale fraction between 0-1.0, or {@link #SNAPSHOT_SCALE_AUTO}
		* to automatically select
		* @param pixelFormat the desired pixel format, or {@link PixelFormat#UNKNOWN} to
		* automatically select
		* @param builder the snapshot builder to populate
		@@ -282,8 +273,7 @@ class TaskSnapshotController {
		* @return true if the state of the task is ok to proceed
		*/
		@VisibleForTesting
		boolean prepareTaskSnapshot(Task task, float scaleFraction, int pixelFormat,
		TaskSnapshot.Builder builder) {
		boolean prepareTaskSnapshot(Task task, int pixelFormat, TaskSnapshot.Builder builder) {
		if (!mService.mPolicy.isScreenOn()) {
		if (DEBUG_SCREENSHOT) {
		Slog.i(TAG_WM, "Attempted to take screenshot while display was off.");
		@@ -310,21 +300,12 @@ class TaskSnapshotController {
		return false;
		}

		final boolean isLowRamDevice = ActivityManager.isLowRamDeviceStatic();

		builder.setIsRealSnapshot(true);
		builder.setId(System.currentTimeMillis());
		builder.setContentInsets(getInsets(mainWindow));

		final boolean isLowRamDevice = ActivityManager.isLowRamDeviceStatic();

		if (scaleFraction == SNAPSHOT_SCALE_AUTO) {
		builder.setScaleFraction(isLowRamDevice
		? mPersister.getLowResScale()
		: mHighResTaskSnapshotScale);
		builder.setIsLowResolution(isLowRamDevice);
		} else {
		builder.setScaleFraction(scaleFraction);
		builder.setIsLowResolution(scaleFraction < 1.0f);
		}

		final boolean isWindowTranslucent = mainWindow.getAttrs().format != PixelFormat.OPAQUE;
		final boolean isShowWallpaper = (mainWindow.getAttrs().flags & FLAG_SHOW_WALLPAPER) != 0;
		@@ -349,15 +330,27 @@ class TaskSnapshotController {
		return true;
		}

		@Nullable
		SurfaceControl.ScreenshotGraphicBuffer createTaskSnapshot(@NonNull Task task,
		TaskSnapshot.Builder builder) {
		Point taskSize = new Point();
		float scale = builder.isLowResolution()
		? mPersister.getLowResScale() : mHighResTaskSnapshotScale;
		final SurfaceControl.ScreenshotGraphicBuffer taskSnapshot = createTaskSnapshot(task, scale,
		builder.getPixelFormat(), taskSize);
		builder.setTaskSize(taskSize);
		return taskSnapshot;
		}

		@Nullable
		SurfaceControl.ScreenshotGraphicBuffer createTaskSnapshot(@NonNull Task task,
		float scaleFraction) {
		return createTaskSnapshot(task, scaleFraction, PixelFormat.RGBA_8888);
		return createTaskSnapshot(task, scaleFraction, PixelFormat.RGBA_8888, null);
		}

		@Nullable
		SurfaceControl.ScreenshotGraphicBuffer createTaskSnapshot(@NonNull Task task,
		float scaleFraction, int pixelFormat) {
		float scaleFraction, int pixelFormat, Point outTaskSize) {
		if (task.getSurfaceControl() == null) {
		if (DEBUG_SCREENSHOT) {
		Slog.w(TAG_WM, "Failed to take screenshot. No surface control for " + task);
		@@ -369,6 +362,10 @@ class TaskSnapshotController {
		final SurfaceControl.ScreenshotGraphicBuffer screenshotBuffer =
		SurfaceControl.captureLayers(
		task.getSurfaceControl(), mTmpRect, scaleFraction, pixelFormat);
		if (outTaskSize != null) {
		outTaskSize.x = mTmpRect.width();
		outTaskSize.y = mTmpRect.height();
		}
		final GraphicBuffer buffer = screenshotBuffer != null ? screenshotBuffer.getGraphicBuffer()
		: null;
		if (buffer == null \|\| buffer.getWidth() <= 1 \|\| buffer.getHeight() <= 1) {
		@@ -379,21 +376,20 @@ class TaskSnapshotController {

		@Nullable
		TaskSnapshot snapshotTask(Task task) {
		return snapshotTask(task, SNAPSHOT_SCALE_AUTO, PixelFormat.UNKNOWN);
		return snapshotTask(task, PixelFormat.UNKNOWN);
		}

		@Nullable
		TaskSnapshot snapshotTask(Task task, float scaleFraction, int pixelFormat) {
		TaskSnapshot snapshotTask(Task task, int pixelFormat) {
		TaskSnapshot.Builder builder = new TaskSnapshot.Builder();

		if (!prepareTaskSnapshot(task, scaleFraction, pixelFormat, builder)) {
		if (!prepareTaskSnapshot(task, pixelFormat, builder)) {
		// Failed some pre-req. Has been logged.
		return null;
		}

		final SurfaceControl.ScreenshotGraphicBuffer screenshotBuffer =
		createTaskSnapshot(task, builder.getScaleFraction(),
		builder.getPixelFormat());
		createTaskSnapshot(task, builder);

		if (screenshotBuffer == null) {
		// Failed to acquire image. Has been logged.
		@@ -472,8 +468,10 @@ class TaskSnapshotController {
		final SystemBarBackgroundPainter decorPainter = new SystemBarBackgroundPainter(attrs.flags,
		attrs.privateFlags, attrs.systemUiVisibility, task.getTaskDescription(),
		mHighResTaskSnapshotScale, mainWindow.getRequestedInsetsState());
		final int width = (int) (task.getBounds().width() * mHighResTaskSnapshotScale);
		final int height = (int) (task.getBounds().height() * mHighResTaskSnapshotScale);
		final int taskWidth = task.getBounds().width();
		final int taskHeight = task.getBounds().height();
		final int width = (int) (taskWidth * mHighResTaskSnapshotScale);
		final int height = (int) (taskHeight * mHighResTaskSnapshotScale);

		final RenderNode node = RenderNode.create("TaskSnapshotController", null);
		node.setLeftTopRightBottom(0, 0, width, height);
		@@ -494,9 +492,9 @@ class TaskSnapshotController {
		System.currentTimeMillis() /* id */,
		topChild.mActivityComponent, hwBitmap.createGraphicBufferHandle(),
		hwBitmap.getColorSpace(), mainWindow.getConfiguration().orientation,
		mainWindow.getWindowConfiguration().getRotation(),
		mainWindow.getWindowConfiguration().getRotation(), new Point(taskWidth, taskHeight),
		getInsets(mainWindow), ActivityManager.isLowRamDeviceStatic() /* isLowResolution */,
		mHighResTaskSnapshotScale, false /* isRealSnapshot */, task.getWindowingMode(),
		false /* isRealSnapshot */, task.getWindowingMode(),
		getSystemUiVisibility(task), false);
		}

services/core/java/com/android/server/wm/TaskSnapshotLoader.java

+21 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.wm;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		import android.app.ActivityManager;
		import android.app.ActivityManager.TaskSnapshot;
		import android.content.ComponentName;
		import android.graphics.Bitmap;
		@@ -26,6 +27,7 @@ import android.graphics.Bitmap.Config;
		import android.graphics.BitmapFactory;
		import android.graphics.BitmapFactory.Options;
		import android.graphics.GraphicBuffer;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.util.Slog;

		@@ -46,6 +48,9 @@ class TaskSnapshotLoader {

		private static final String TAG = TAG_WITH_CLASS_NAME ? "TaskSnapshotLoader" : TAG_WM;

		private static final float LEGACY_REDUCED_SCALE =
		ActivityManager.isLowRamDeviceStatic() ? 0.6f : 0.5f;

		private final TaskSnapshotPersister mPersister;

		TaskSnapshotLoader(TaskSnapshotPersister persister) {
		@@ -99,13 +104,25 @@ class TaskSnapshotLoader {

		final ComponentName topActivityComponent = ComponentName.unflattenFromString(
		proto.topActivityComponent);

		// For legacy snapshots, restore the scale based on the reduced resolution state
		Point taskSize;
		if (proto.taskWidth == 0) {
		// For legacy snapshots, restore the scale based on the reduced resolution state
		final float legacyScale = isLowResolution ? mPersister.getLowResScale() : 1f;
		final float scale = Float.compare(proto.scale, 0f) != 0 ? proto.scale : legacyScale;
		final float preQLegacyScale = isLowResolution ? LEGACY_REDUCED_SCALE : 1f;
		final float scale = Float.compare(proto.legacyScale, 0f) != 0
		? proto.legacyScale : preQLegacyScale;
		int taskWidth = (int) ((float) hwBitmap.getWidth() / scale);
		int taskHeight = (int) ((float) hwBitmap.getHeight() / scale);
		taskSize = new Point(taskWidth, taskHeight);
		} else {
		taskSize = new Point(proto.taskWidth, proto.taskHeight);
		}

		return new TaskSnapshot(proto.id, topActivityComponent, buffer, hwBitmap.getColorSpace(),
		proto.orientation, proto.rotation,
		proto.orientation, proto.rotation, taskSize,
		new Rect(proto.insetLeft, proto.insetTop, proto.insetRight, proto.insetBottom),
		isLowResolution, scale, proto.isRealSnapshot, proto.windowingMode,
		isLowResolution, proto.isRealSnapshot, proto.windowingMode,
		proto.systemUiVisibility, proto.isTranslucent);
		} catch (IOException e) {
		Slog.w(TAG, "Unable to load task snapshot data for taskId=" + taskId);