Merge "Add TaskSnapshot reference when used for Content suggestion." into main (ca377d7d) · Commits · e / os / android_frameworks_base

core/java/android/window/TaskSnapshot.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -83,13 +83,16 @@ public class TaskSnapshot implements Parcelable {
	public static final int REFERENCE_CACHE = 1 << 1;		public static final int REFERENCE_CACHE = 1 << 1;
	/** This snapshot object is being persistent. */		/** This snapshot object is being persistent. */
	public static final int REFERENCE_PERSIST = 1 << 2;		public static final int REFERENCE_PERSIST = 1 << 2;
			/** This snapshot object is being used for content suggestion. */
			public static final int REFERENCE_CONTENT_SUGGESTION = 1 << 3;
	@IntDef(flag = true, prefix = { "REFERENCE_" }, value = {		@IntDef(flag = true, prefix = { "REFERENCE_" }, value = {
	REFERENCE_BROADCAST,		REFERENCE_BROADCAST,
	REFERENCE_CACHE,		REFERENCE_CACHE,
	REFERENCE_PERSIST		REFERENCE_PERSIST,
			REFERENCE_CONTENT_SUGGESTION
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@interface ReferenceFlags {}		public @interface ReferenceFlags {}

	public TaskSnapshot(long id, long captureTime,		public TaskSnapshot(long id, long captureTime,
	@NonNull ComponentName topActivityComponent, HardwareBuffer snapshot,		@NonNull ComponentName topActivityComponent, HardwareBuffer snapshot,

services/contentsuggestions/java/com/android/server/contentsuggestions/ContentSuggestionsManagerService.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -160,11 +160,13 @@ public class ContentSuggestionsManagerService extends
	HardwareBuffer snapshotBuffer = null;		HardwareBuffer snapshotBuffer = null;
	int colorSpaceId = 0;		int colorSpaceId = 0;

			TaskSnapshot snapshot = null;
	// Skip taking TaskSnapshot when bitmap is provided.		// Skip taking TaskSnapshot when bitmap is provided.
	if (!imageContextRequestExtras.containsKey(ContentSuggestionsManager.EXTRA_BITMAP)) {		if (!imageContextRequestExtras.containsKey(ContentSuggestionsManager.EXTRA_BITMAP)) {
	// Can block, so call before acquiring the lock.		// Can block, so call before acquiring the lock.
	TaskSnapshot snapshot =		snapshot = mActivityTaskManagerInternal.getTaskSnapshotBlocking(
	mActivityTaskManagerInternal.getTaskSnapshotBlocking(taskId, false);		taskId, false /* isLowResolution */,
			TaskSnapshot.REFERENCE_CONTENT_SUGGESTION);
	if (snapshot != null) {		if (snapshot != null) {
	snapshotBuffer = snapshot.getHardwareBuffer();		snapshotBuffer = snapshot.getHardwareBuffer();
	ColorSpace colorSpace = snapshot.getColorSpace();		ColorSpace colorSpace = snapshot.getColorSpace();
	@@ -185,6 +187,9 @@ public class ContentSuggestionsManagerService extends
	}		}
	}		}
	}		}
			if (snapshot != null) {
			snapshot.removeReference(TaskSnapshot.REFERENCE_CONTENT_SUGGESTION);
			}
	}		}

	@Override		@Override

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -589,7 +589,7 @@ public abstract class ActivityTaskManagerInternal {
	* sensitive environment.		* sensitive environment.
	*/		*/
	public abstract TaskSnapshot getTaskSnapshotBlocking(int taskId,		public abstract TaskSnapshot getTaskSnapshotBlocking(int taskId,
	boolean isLowResolution);		boolean isLowResolution, @TaskSnapshot.ReferenceFlags int usage);

	/** Returns true if uid is considered foreground for activity start purposes. */		/** Returns true if uid is considered foreground for activity start purposes. */
	public abstract boolean isUidForeground(int uid);		public abstract boolean isUidForeground(int uid);

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

+25 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3946,6 +3946,28 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	}		}
	}		}

			private TaskSnapshot getTaskSnapshotInner(int taskId, boolean isLowResolution,
			@TaskSnapshot.ReferenceFlags int usage) {
			final Task task;
			synchronized (mGlobalLock) {
			task = mRootWindowContainer.anyTaskForId(taskId, MATCH_ATTACHED_TASK_OR_RECENT_TASKS);
			if (task == null) {
			Slog.w(TAG, "getTaskSnapshot: taskId=" + taskId + " not found");
			return null;
			}
			// Try to load snapshot from cache first, and add reference if the snapshot is in cache.
			final TaskSnapshot snapshot = mWindowManager.mTaskSnapshotController.getSnapshot(taskId,
			task.mUserId, false /* restoreFromDisk */, isLowResolution);
			if (snapshot != null) {
			snapshot.addReference(usage);
			return snapshot;
			}
			}
			// Don't call this while holding the lock as this operation might hit the disk.
			return mWindowManager.mTaskSnapshotController.getSnapshot(taskId,
			task.mUserId, true /* restoreFromDisk */, isLowResolution);
			}

	@Override		@Override
	public TaskSnapshot getTaskSnapshot(int taskId, boolean isLowResolution) {		public TaskSnapshot getTaskSnapshot(int taskId, boolean isLowResolution) {
	mAmInternal.enforceCallingPermission(READ_FRAME_BUFFER, "getTaskSnapshot()");		mAmInternal.enforceCallingPermission(READ_FRAME_BUFFER, "getTaskSnapshot()");
	@@ -7274,8 +7296,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

	@Override		@Override
	public TaskSnapshot getTaskSnapshotBlocking(		public TaskSnapshot getTaskSnapshotBlocking(
	int taskId, boolean isLowResolution) {		int taskId, boolean isLowResolution, @TaskSnapshot.ReferenceFlags int usage) {
	return ActivityTaskManagerService.this.getTaskSnapshot(taskId, isLowResolution);		return ActivityTaskManagerService.this.getTaskSnapshotInner(
			taskId, isLowResolution, usage);
	}		}

	@Override		@Override