Merge "Reduce parceled data size between system & sysui" into rvc-dev am: b16c3b1fb5 (598192fd) · Commits · e / os / android_frameworks_base

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -2800,14 +2800,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		userId = handleIncomingUser(Binder.getCallingPid(), callingUid, userId, "getRecentTasks");
		final boolean allowed = isGetTasksAllowed("getRecentTasks", Binder.getCallingPid(),
		callingUid);
		final boolean detailed = checkGetTasksPermission(
		android.Manifest.permission.GET_DETAILED_TASKS, Binder.getCallingPid(),
		UserHandle.getAppId(callingUid))
		== PackageManager.PERMISSION_GRANTED;

		synchronized (mGlobalLock) {
		return mRecentTasks.getRecentTasks(maxNum, flags, allowed, detailed, userId,
		callingUid);
		return mRecentTasks.getRecentTasks(maxNum, flags, allowed, userId, callingUid);
		}
		}

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

+5 −12

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import android.content.pm.ParceledListSlice;
		import android.content.pm.UserInfo;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.os.Bundle;
		import android.os.Environment;
		import android.os.IBinder;
		import android.os.RemoteException;
		@@ -874,16 +873,16 @@ class RecentTasks {
		* @return the list of recent tasks for presentation.
		*/
		ParceledListSlice<ActivityManager.RecentTaskInfo> getRecentTasks(int maxNum, int flags,
		boolean getTasksAllowed, boolean getDetailedTasks, int userId, int callingUid) {
		boolean getTasksAllowed, int userId, int callingUid) {
		return new ParceledListSlice<>(getRecentTasksImpl(maxNum, flags, getTasksAllowed,
		getDetailedTasks, userId, callingUid));
		userId, callingUid));
		}

		/**
		* @return the list of recent tasks for presentation.
		*/
		private ArrayList<ActivityManager.RecentTaskInfo> getRecentTasksImpl(int maxNum, int flags,
		boolean getTasksAllowed, boolean getDetailedTasks, int userId, int callingUid) {
		boolean getTasksAllowed, int userId, int callingUid) {
		final boolean withExcluded = (flags & RECENT_WITH_EXCLUDED) != 0;

		if (!isUserRunning(userId, FLAG_AND_UNLOCKED)) {
		@@ -961,12 +960,7 @@ class RecentTasks {
		continue;
		}

		final ActivityManager.RecentTaskInfo rti = createRecentTaskInfo(task);
		if (!getDetailedTasks) {
		rti.baseIntent.replaceExtras((Bundle) null);
		}

		res.add(rti);
		res.add(createRecentTaskInfo(task));
		}
		return res;
		}
		@@ -1745,8 +1739,7 @@ class RecentTasks {
		// Reset the header flag for the next block
		printedHeader = false;
		ArrayList<ActivityManager.RecentTaskInfo> tasks = getRecentTasksImpl(Integer.MAX_VALUE,
		0, true /* getTasksAllowed /, false / getDetailedTasks */,
		mService.getCurrentUserId(), SYSTEM_UID);
		0, true /* getTasksAllowed */, mService.getCurrentUserId(), SYSTEM_UID);
		for (int i = 0; i < tasks.size(); i++) {
		final ActivityManager.RecentTaskInfo taskInfo = tasks.get(i);
		if (!printedHeader) {

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.util.ArraySet;
		import com.android.internal.util.function.pooled.PooledConsumer;
		import com.android.internal.util.function.pooled.PooledLambda;

		import java.util.ArrayList;
		import java.util.Comparator;
		import java.util.Iterator;
		import java.util.List;
		@@ -44,7 +43,6 @@ class RunningTasks {
		(o1, o2) -> Long.signum(o2.lastActiveTime - o1.lastActiveTime);

		private final TreeSet<Task> mTmpSortedSet = new TreeSet<>(LAST_ACTIVE_TIME_COMPARATOR);
		private final ArrayList<Task> mTmpStackTasks = new ArrayList<>();

		private int mCallingUid;
		private int mUserId;
		@@ -132,8 +130,7 @@ class RunningTasks {

		/** Constructs a {@link RunningTaskInfo} from a given {@param task}. */
		private RunningTaskInfo createRunningTaskInfo(Task task) {
		final RunningTaskInfo rti = new RunningTaskInfo();
		task.fillTaskInfo(rti);
		final RunningTaskInfo rti = task.getTaskInfo();
		// Fill in some deprecated values
		rti.id = rti.taskId;
		return rti;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3281,8 +3281,8 @@ class Task extends WindowContainer<WindowContainer> {
		}

		/**
		* Fills in a {@link TaskInfo} with information from this task.
		* @param info the {@link TaskInfo} to fill in
		* Fills in a {@link TaskInfo} with information from this task. Note that the base intent in the
		* task info will not include any extras or clip data.
		*/
		void fillTaskInfo(TaskInfo info) {
		getNumRunningActivities(mReuseActivitiesReport);
		@@ -3294,7 +3294,7 @@ class Task extends WindowContainer<WindowContainer> {
		final Intent baseIntent = getBaseIntent();
		// Make a copy of base intent because this is like a snapshot info.
		// Besides, {@link RecentTasks#getRecentTasksImpl} may modify it.
		info.baseIntent = baseIntent == null ? new Intent() : new Intent(baseIntent);
		info.baseIntent = baseIntent == null ? new Intent() : baseIntent.cloneFilter();
		info.baseActivity = mReuseActivitiesReport.base != null
		? mReuseActivitiesReport.base.intent.getComponent()
		: null;

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -253,8 +253,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub
		final int nextId = display.getNextStackId();
		TaskTile tile = new TaskTile(mService, nextId, windowingMode);
		display.addTile(tile);
		RunningTaskInfo out = new RunningTaskInfo();
		tile.fillTaskInfo(out);
		RunningTaskInfo out = tile.getTaskInfo();
		mLastSentTaskInfos.put(tile, out);
		return out;
		}
		@@ -412,9 +411,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub
		&& !ArrayUtils.contains(activityTypes, as.getActivityType())) {
		continue;
		}
		final RunningTaskInfo info = new RunningTaskInfo();
		as.fillTaskInfo(info);
		out.add(info);
		out.add(as.getTaskInfo());
		}
		}
		return out;
		@@ -447,9 +444,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub
		&& !ArrayUtils.contains(activityTypes, task.getActivityType())) {
		continue;
		}
		final RunningTaskInfo info = new RunningTaskInfo();
		task.fillTaskInfo(info);
		out.add(info);
		out.add(task.getTaskInfo());
		}
		return out;
		}