Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev

Browse Source
This commit is contained in:
Louis Chang
2023-01-06 00:34:01 +00:00
committed by Android (Google) Code Review
parent 28dae0e4c9 5caf2dde3d
commit 6790434470
4 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/AppTaskImpl.java
View File

@@ -84,7 +84,7 @@ class AppTaskImpl extends IAppTask.Stub {
throw new IllegalArgumentException("Unable to find task ID " + mTaskId);
}
return mService.getRecentTasks().createRecentTaskInfo(task,
false /* stripExtras */, true /* getTasksAllowed */);
false /* stripExtras */);
} finally {
Binder.restoreCallingIdentity(origId);
}

8
services/core/java/com/android/server/wm/RecentTasks.java
View File

@@ -961,7 +961,7 @@ class RecentTasks {
continue;
}
res.add(createRecentTaskInfo(task, true /* stripExtras */, getTasksAllowed));
res.add(createRecentTaskInfo(task, true /* stripExtras */));
}
return res;
}
@@ -1833,16 +1833,12 @@ class RecentTasks {
/**
* Creates a new RecentTaskInfo from a Task.
*/
ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr, boolean stripExtras,
boolean getTasksAllowed) {
ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr, boolean stripExtras) {
ActivityManager.RecentTaskInfo rti = new ActivityManager.RecentTaskInfo();
tr.fillTaskInfo(rti, stripExtras);
// Fill in some deprecated values
rti.id = rti.isRunning ? rti.taskId : INVALID_TASK_ID;
rti.persistentId = rti.taskId;
if (!getTasksAllowed) {
Task.trimIneffectiveInfo(tr, rti);
}
return rti;
}

4
services/core/java/com/android/server/wm/RunningTasks.java
View File

@@ -129,10 +129,6 @@ class RunningTasks {
final RunningTaskInfo rti = task.getTaskInfo();
// Fill in some deprecated values
rti.id = rti.taskId;
if (!mAllowed) {
Task.trimIneffectiveInfo(task, rti);
}
return rti;
}
}

21
services/core/java/com/android/server/wm/Task.java
View File

@@ -3631,27 +3631,6 @@ class Task extends WindowContainer<WindowContainer> {
: null;
}
/**
* Removes the activity info if the activity belongs to a different uid, which is
* different from the app that hosts the task.
*/
static void trimIneffectiveInfo(Task task, TaskInfo info) {
final ActivityRecord baseActivity = task.getActivity(r -> !r.finishing,
false /* traverseTopToBottom */);
final int baseActivityUid =
baseActivity != null ? baseActivity.getUid() : task.effectiveUid;
if (info.topActivityInfo != null
&& task.effectiveUid != info.topActivityInfo.applicationInfo.uid) {
info.topActivity = null;
info.topActivityInfo = null;
}
if (task.effectiveUid != baseActivityUid) {
info.baseActivity = null;
}
}
/**
* Returns a {@link TaskInfo} with information from this task.
*/