Snap for 8909196 from 0dfdd607b73253cdce122075b390cd6eed752a22 to tm-qpr1-release (508795d8) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -513,6 +513,9 @@ public final class JobStatus {
		if (latestRunTimeElapsedMillis != NO_LATEST_RUNTIME) {
		requiredConstraints \|= CONSTRAINT_DEADLINE;
		}
		if (job.isPrefetch()) {
		requiredConstraints \|= CONSTRAINT_PREFETCH;
		}
		boolean exemptedMediaUrisOnly = false;
		if (job.getTriggerContentUris() != null) {
		requiredConstraints \|= CONSTRAINT_CONTENT_TRIGGER;

core/java/android/app/ActivityTaskManager.java

+19 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.app;

		import static android.view.Display.INVALID_DISPLAY;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		@@ -369,7 +371,8 @@ public class ActivityTaskManager {
		* @hide
		*/
		public List<ActivityManager.RunningTaskInfo> getTasks(int maxNum) {
		return getTasks(maxNum, false /* filterForVisibleRecents */);
		return getTasks(maxNum, false /* filterForVisibleRecents /, false / keepIntentExtra */,
		INVALID_DISPLAY);
		}

		/**
		@@ -378,7 +381,8 @@ public class ActivityTaskManager {
		*/
		public List<ActivityManager.RunningTaskInfo> getTasks(
		int maxNum, boolean filterOnlyVisibleRecents) {
		return getTasks(maxNum, filterOnlyVisibleRecents, false /* keepIntentExtra */);
		return getTasks(maxNum, filterOnlyVisibleRecents, false /* keepIntentExtra */,
		INVALID_DISPLAY);
		}

		/**
		@@ -388,8 +392,20 @@ public class ActivityTaskManager {
		*/
		public List<ActivityManager.RunningTaskInfo> getTasks(
		int maxNum, boolean filterOnlyVisibleRecents, boolean keepIntentExtra) {
		return getTasks(maxNum, filterOnlyVisibleRecents, keepIntentExtra, INVALID_DISPLAY);
		}

		/**
		* @return List of running tasks that can be filtered by visibility and displayId in recents
		* and keep intent extra.
		* @param displayId the target display id, or {@link INVALID_DISPLAY} not to filter by displayId
		* @hide
		*/
		public List<ActivityManager.RunningTaskInfo> getTasks(
		int maxNum, boolean filterOnlyVisibleRecents, boolean keepIntentExtra, int displayId) {
		try {
		return getService().getTasks(maxNum, filterOnlyVisibleRecents, keepIntentExtra);
		return getService().getTasks(maxNum, filterOnlyVisibleRecents, keepIntentExtra,
		displayId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/IActivityTaskManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ interface IActivityTaskManager {
		boolean removeTask(int taskId);
		void removeAllVisibleRecentTasks();
		List<ActivityManager.RunningTaskInfo> getTasks(int maxNum, boolean filterOnlyVisibleRecents,
		boolean keepIntentExtra);
		boolean keepIntentExtra, int displayId);
		void moveTaskToFront(in IApplicationThread app, in String callingPackage, int task,
		int flags, in Bundle options);
		ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags,

core/java/android/service/voice/VoiceInteractionManagerInternal.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.service.voice;

		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.os.Bundle;
		import android.os.IBinder;

		@@ -64,6 +65,13 @@ public abstract class VoiceInteractionManagerInternal {
		@Nullable
		public abstract HotwordDetectionServiceIdentity getHotwordDetectionServiceIdentity();

		/**
		* Called by {@code UMS.convertPreCreatedUserIfPossible()} when a new user is not created from
		* scratched, but converted from the pool of existing pre-created users.
		*/
		// TODO(b/226201975): remove method once RoleService supports pre-created users
		public abstract void onPreCreatedUserConversion(@UserIdInt int userId);

		/**
		* Provides the uids of the currently active
		* {@link android.service.voice.HotwordDetectionService} and its owning package. The

core/java/android/view/IWindowFocusObserver.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		package android.view;

		/** {@hide} */
		interface IWindowFocusObserver
		oneway interface IWindowFocusObserver
		{
		void focusGained(IBinder inputToken);
		void focusLost(IBinder inputToken);